From patchwork Fri Apr 14 12:59:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 9681231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C98560386 for ; Fri, 14 Apr 2017 12:59:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2D8A28631 for ; Fri, 14 Apr 2017 12:59:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7AF92864C; Fri, 14 Apr 2017 12:59:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A61FE28631 for ; Fri, 14 Apr 2017 12:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752515AbdDNM72 (ORCPT ); Fri, 14 Apr 2017 08:59:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50238 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949AbdDNM72 (ORCPT ); Fri, 14 Apr 2017 08:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9391804FE; Fri, 14 Apr 2017 12:59:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D9391804FE Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=hdegoede@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D9391804FE Received: from shalem.localdomain.com (ovpn-116-163.ams2.redhat.com [10.36.116.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2C805C3FD; Fri, 14 Apr 2017 12:59:26 +0000 (UTC) From: Hans de Goede To: Sebastian Reichel , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Cc: Hans de Goede , linux-pm@vger.kernel.org Subject: [PATCH 05/13] power: max17042_battery: Change name in power_supply_desc to "main-battery" Date: Fri, 14 Apr 2017 14:59:11 +0200 Message-Id: <20170414125919.25771-5-hdegoede@redhat.com> In-Reply-To: <20170414125919.25771-1-hdegoede@redhat.com> References: <20170414125919.25771-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 14 Apr 2017 12:59:28 +0000 (UTC) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The max17042 will typically be couple with some charger IC, almost all charger drivers contain: static char *xxx_charger_supplied_to[] = { "main-battery", }; probe() { struct power_supply_config cfg; cfg.supplied_to = xxx_charger_supplied_to; cfg.num_supplicants = ARRAY_SIZE(xxx_charger_supplied_to); xxx->charger = power_supply_register(dev, &x_charger_desc, &_cfg); } Change the name in max17042's power_supply_desc to "main-battery" to match, so that power_supply_am_i_supplied() can be used to implement POWER_SUPPLY_PROP_STATUS. Signed-off-by: Hans de Goede Reviewed-by: Krzysztof Kozlowski --- drivers/power/supply/max17042_battery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c index 85a6bf3..f8a0384 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -866,7 +866,7 @@ static const struct regmap_config max17042_regmap_config = { }; static const struct power_supply_desc max17042_psy_desc = { - .name = "max170xx_battery", + .name = "main-battery", .type = POWER_SUPPLY_TYPE_BATTERY, .get_property = max17042_get_property, .set_property = max17042_set_property, @@ -876,7 +876,7 @@ static const struct power_supply_desc max17042_psy_desc = { }; static const struct power_supply_desc max17042_no_current_sense_psy_desc = { - .name = "max170xx_battery", + .name = "main-battery", .type = POWER_SUPPLY_TYPE_BATTERY, .get_property = max17042_get_property, .set_property = max17042_set_property,