From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83463C64E7C for ; Wed, 2 Dec 2020 21:51:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F51522206 for ; Wed, 2 Dec 2020 21:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727109AbgLBVvn (ORCPT ); Wed, 2 Dec 2020 16:51:43 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:44145 "EHLO mail-ej1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726283AbgLBVvm (ORCPT ); Wed, 2 Dec 2020 16:51:42 -0500 Received: by mail-ej1-f65.google.com with SMTP id m19so289938ejj.11; Wed, 02 Dec 2020 13:51:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=tUAab35rF6lnneOH96CQNbNoct6bAobczRr2vD0hIU0=; b=NY/gy1KpfzGKryXwfG9+KOgJZYoCjjP6yv2FpSszjg6yWcnGVa2JPfUZkvQbRQtzOP PsP776r274sR2cwnAZ5sZKKMq8nbrhMZjY98ZkofivnzBzTSFGNOTx6nuEADvG+7TbhZ 8SiyVdtSSEHQP/ta9vdzeqPqz9w0Kt3dIV/HzSZ/tzrxRo51LbiCTatTE2dglKRMSVwA jxH0n1ia83JOBndNf1K8ujpzpr9u7OCMlvCfDPYL300ifC8RObG4stjwUG9EAzZRNS3F 9elpWv58PMtfxZ82+eOuIPJYbhhvtyx5OqF+lQV5ZXArl46dOz1bpttuGoHarENkR+sC Sh2A== X-Gm-Message-State: AOAM532EuCdf8eo8WZz2VrNJaY4pv92T2Zn62s5WDTjsU7wEoXtFIIqi UCo3KvsxDs9WsSw0eod5mcQ= X-Google-Smtp-Source: ABdhPJxFJdNekGxJGIwPUEqa1Ok5VRdnDf1X4lIvst0vcnSvkiomAogFk8Sojcuq0Hngndpn+8Gx2A== X-Received: by 2002:a17:906:451:: with SMTP id e17mr1699790eja.228.1606945859840; Wed, 02 Dec 2020 13:50:59 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id i2sm9199edk.93.2020.12.02.13.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 13:50:58 -0800 (PST) Date: Wed, 2 Dec 2020 23:50:57 +0200 From: Krzysztof Kozlowski To: Timon Baetz Cc: Sebastian Reichel , Chanwoo Choi , MyungJoo Ham , Kukjin Kim , Rob Herring , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Subject: Re: [PATCH 2/3] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201202215057.GA135888@kozik-lap> References: <20201202203516.43053-1-timon.baetz@protonmail.com> <20201202203516.43053-2-timon.baetz@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201202203516.43053-2-timon.baetz@protonmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 02, 2020 at 09:07:19PM +0000, Timon Baetz wrote: > Register for extcon notification and set charging current depending on > the detected cable type. Current values are taken from i9100 kernel > fork. > > Enable and disable the CHARGER regulator based on extcon events and > remove regulator-always-on from the device tree. > > Signed-off-by: Timon Baetz > --- > arch/arm/boot/dts/exynos4210-i9100.dts | 1 - > drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++ > 2 files changed, 92 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts > index 6d0c04d77a39..9f8d927e0d21 100644 > --- a/arch/arm/boot/dts/exynos4210-i9100.dts > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts > @@ -560,7 +560,6 @@ charger_reg: CHARGER { > regulator-name = "CHARGER"; > regulator-min-microamp = <60000>; > regulator-max-microamp = <2580000>; > - regulator-always-on; Thanks for the patch. The DTS changes always go separately. > }; > > chargercv_reg: CHARGER_CV { > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c > index 1947af25879a..26cd271576ec 100644 > --- a/drivers/power/supply/max8997_charger.c > +++ b/drivers/power/supply/max8997_charger.c > @@ -6,6 +6,7 @@ > // MyungJoo Ham > > #include > +#include > #include > #include > #include > @@ -31,6 +32,12 @@ struct charger_data { > struct device *dev; > struct max8997_dev *iodev; > struct power_supply *battery; > + struct regulator *reg; You need to include regulator consumer.h. > + struct { It makes all dereferences longer. Just add a comment that these are related to the extcon. > + struct extcon_dev *edev; > + struct notifier_block nb; > + struct work_struct work; > + } extcon; > }; > > static enum power_supply_property max8997_battery_props[] = { > @@ -88,6 +95,63 @@ static int max8997_battery_get_property(struct power_supply *psy, > return 0; > } > > +static void max8997_battery_extcon_evt_stop_work(void *data) > +{ > + struct charger_data *charger = data; > + > + cancel_work_sync(&charger->extcon.work); > +} > + > +static void max8997_battery_extcon_evt_worker(struct work_struct *work) > +{ > + struct charger_data *charger = > + container_of(work, struct charger_data, extcon.work); > + int ret, current_limit; > + struct extcon_dev *edev = charger->extcon.edev; > + It would be useful to report the current with POWER_SUPPLY_PROP_* but it is a different patch. > + if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) { > + dev_dbg(charger->dev, "USB SDP charger is connected\n"); > + current_limit = 450000; > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) { > + dev_dbg(charger->dev, "USB DCP charger is connected\n"); > + current_limit = 650000; > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) { > + dev_dbg(charger->dev, "USB FAST charger is connected\n"); > + current_limit = 650000; > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) { > + dev_dbg(charger->dev, "USB SLOW charger is connected\n"); > + current_limit = 650000; The charger provides 500 mA, so I wonder whether 650 here is correct. Is it at different voltage? > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) { > + dev_dbg(charger->dev, "USB CDP charger is connected\n"); > + current_limit = 650000; > + } else { > + dev_dbg(charger->dev, "USB charger is diconnected\n"); > + current_limit = -1; > + } > + > + if (current_limit > 0) { ret should be declared here. > + ret = regulator_set_current_limit(charger->reg, current_limit, current_limit); > + if (ret) > + dev_err(charger->dev, "failed to set current limit: %d\n", ret); Failure of setting the current should rather disable the charging. > + ret = regulator_enable(charger->reg); > + if (ret) > + dev_err(charger->dev, "failed to enable regulator: %d\n", ret); > + } else { ret should be declared here. > + ret = regulator_disable(charger->reg); > + if (ret) > + dev_err(charger->dev, "failed to disable regulator: %d\n", ret); > + } What about top-off charging? > +} > + > +static int max8997_battery_extcon_evt(struct notifier_block *nb, > + unsigned long event, void *param) > +{ > + struct charger_data *charger = > + container_of(nb, struct charger_data, extcon.nb); > + schedule_work(&charger->extcon.work); > + return NOTIFY_OK; > +} > + > static const struct power_supply_desc max8997_battery_desc = { > .name = "max8997_pmic", > .type = POWER_SUPPLY_TYPE_BATTERY, > @@ -104,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev) > struct i2c_client *i2c = iodev->i2c; > struct max8997_platform_data *pdata = iodev->pdata; > struct power_supply_config psy_cfg = {}; > + struct extcon_dev *edev; > > if (!pdata) { > dev_err(&pdev->dev, "No platform data supplied.\n"); > @@ -151,6 +216,12 @@ static int max8997_battery_probe(struct platform_device *pdev) > return ret; > } > > + edev = extcon_get_extcon_dev("max8997-muic"); Store it directly under charger->edev. > + if (edev == NULL) { if (!edev) { > + dev_info(&pdev->dev, "extcon is not ready, probe deferred\n"); Do not print anything on deferrals. > + return -EPROBE_DEFER; > + } > + > charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL); > if (!charger) > return -ENOMEM; > @@ -170,6 +241,27 @@ static int max8997_battery_probe(struct platform_device *pdev) > return PTR_ERR(charger->battery); > } > > + charger->reg = regulator_get(&pdev->dev, "CHARGER"); Here and in extcon_get_extcon_dev() - you make all these devices tightly coupled. It will work, but I am afraid it's easy to break later. Instead you should have a device node in DTS to which the charger could bind and where the driver will find regulator supply and extcon phandles (with extcon_get_edev_by_phandle() for example). > + if (IS_ERR(charger->reg)) { > + dev_err(&pdev->dev, "couldn't get CHARGER regulator\n"); > + return PTR_ERR(charger->reg); > + } > + > + INIT_WORK(&charger->extcon.work, max8997_battery_extcon_evt_worker); > + ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger); > + if (ret) { > + dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret); Missing regulator_put() here and in other places. Use devm-(). > + return ret; > + } > + charger->extcon.edev = edev; > + charger->extcon.nb.notifier_call = max8997_battery_extcon_evt; > + ret = devm_extcon_register_notifier_all(&pdev->dev, charger->extcon.edev, > + &charger->extcon.nb); Align the arguments with opening '('. Best regards, Krzysztof From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C649FC6369E for ; Wed, 2 Dec 2020 21:52:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51E2B217A0 for ; Wed, 2 Dec 2020 21:52:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51E2B217A0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=C1IM8fSFKiZpWwjZYMnyDEPx61mTOAHa3k/YGO8psQ8=; b=JwWkUcW6oGnCci1ohm3mqcQfa nGPJDglFb29atriGFJe8l2twjgYImnY5+VSY4cuOkuVH6PBpgMSyKXeQxUkx9iz3dj+OehxEwJbAL lH4R8+phW5AxniDS/qA7vaefhK6Im60e5PAos95oxsANOFrUqEdVFSmwrvo+9g01uMrjLCQFbOFXs LWBCepIl0wjbvG14TRBG8Pa9/Cp7KZ9hRz9o9Moz2nsT1zFAeku6s8DoEXiRKEasZb7FpQgObu7oZ np8qJZhv7wT4K+xpAdHdAvD7a/l1scJFT1DnMX1uX3O+Ww7Bj+6g/EqHG+KdDoOJ74p3FGG0Sn6Si T3OOQdUaw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kka1j-0001Wc-VX; Wed, 02 Dec 2020 21:51:08 +0000 Received: from mail-ej1-f66.google.com ([209.85.218.66]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kka1f-0001VM-3m for linux-arm-kernel@lists.infradead.org; Wed, 02 Dec 2020 21:51:04 +0000 Received: by mail-ej1-f66.google.com with SMTP id g20so376932ejb.1 for ; Wed, 02 Dec 2020 13:51:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=tUAab35rF6lnneOH96CQNbNoct6bAobczRr2vD0hIU0=; b=lEghvLOUqbPT6rZazne37jpGvHT4lLmdhASF8P/C3jSeebsxeq/e/Lt5h2neUtcwm9 zeYK/2rFevlI4Itwiq64L8Tn+8ArylO1xzd+UrWCopTiBRjrkNpcv9f7abHZrhLE70Nf 1/wR0aunJUWYV4GDuZPI9G1aIPuH0XUWx4wET5XOcmpu0lgrAmd749BHwIqH+6U+2g2I Z7jWsYF6a2n4nb9qgC+dIWpvUQsqiSwkkT8hw5gW4cVnB9FcxMLINYiRfvbwcJ4bFh1u zjloo1WLw5oyKnt4Mpp2mX4HIUI6Ff4o0Ck81by7QGKAil3GXMWpW/fnvB/Ja9kfz9Mv 3W+g== X-Gm-Message-State: AOAM533LBwmzT1OdH3L4x09aVF2nzp1hZpwqkM24qV5p5ilW3bdbTawM 2TG1V5KD8iC3afUebalv4gA= X-Google-Smtp-Source: ABdhPJxFJdNekGxJGIwPUEqa1Ok5VRdnDf1X4lIvst0vcnSvkiomAogFk8Sojcuq0Hngndpn+8Gx2A== X-Received: by 2002:a17:906:451:: with SMTP id e17mr1699790eja.228.1606945859840; Wed, 02 Dec 2020 13:50:59 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id i2sm9199edk.93.2020.12.02.13.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 13:50:58 -0800 (PST) Date: Wed, 2 Dec 2020 23:50:57 +0200 From: Krzysztof Kozlowski To: Timon Baetz Subject: Re: [PATCH 2/3] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201202215057.GA135888@kozik-lap> References: <20201202203516.43053-1-timon.baetz@protonmail.com> <20201202203516.43053-2-timon.baetz@protonmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201202203516.43053-2-timon.baetz@protonmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201202_165103_190116_83BD7DF1 X-CRM114-Status: GOOD ( 33.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org, Sebastian Reichel , Rob Herring , linux-kernel@vger.kernel.org, Chanwoo Choi , Kukjin Kim , MyungJoo Ham , linux-arm-kernel@lists.infradead.org, ~postmarketos/upstreaming@lists.sr.ht Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Dec 02, 2020 at 09:07:19PM +0000, Timon Baetz wrote: > Register for extcon notification and set charging current depending on > the detected cable type. Current values are taken from i9100 kernel > fork. > > Enable and disable the CHARGER regulator based on extcon events and > remove regulator-always-on from the device tree. > > Signed-off-by: Timon Baetz > --- > arch/arm/boot/dts/exynos4210-i9100.dts | 1 - > drivers/power/supply/max8997_charger.c | 92 ++++++++++++++++++++++++++ > 2 files changed, 92 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts > index 6d0c04d77a39..9f8d927e0d21 100644 > --- a/arch/arm/boot/dts/exynos4210-i9100.dts > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts > @@ -560,7 +560,6 @@ charger_reg: CHARGER { > regulator-name = "CHARGER"; > regulator-min-microamp = <60000>; > regulator-max-microamp = <2580000>; > - regulator-always-on; Thanks for the patch. The DTS changes always go separately. > }; > > chargercv_reg: CHARGER_CV { > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c > index 1947af25879a..26cd271576ec 100644 > --- a/drivers/power/supply/max8997_charger.c > +++ b/drivers/power/supply/max8997_charger.c > @@ -6,6 +6,7 @@ > // MyungJoo Ham > > #include > +#include > #include > #include > #include > @@ -31,6 +32,12 @@ struct charger_data { > struct device *dev; > struct max8997_dev *iodev; > struct power_supply *battery; > + struct regulator *reg; You need to include regulator consumer.h. > + struct { It makes all dereferences longer. Just add a comment that these are related to the extcon. > + struct extcon_dev *edev; > + struct notifier_block nb; > + struct work_struct work; > + } extcon; > }; > > static enum power_supply_property max8997_battery_props[] = { > @@ -88,6 +95,63 @@ static int max8997_battery_get_property(struct power_supply *psy, > return 0; > } > > +static void max8997_battery_extcon_evt_stop_work(void *data) > +{ > + struct charger_data *charger = data; > + > + cancel_work_sync(&charger->extcon.work); > +} > + > +static void max8997_battery_extcon_evt_worker(struct work_struct *work) > +{ > + struct charger_data *charger = > + container_of(work, struct charger_data, extcon.work); > + int ret, current_limit; > + struct extcon_dev *edev = charger->extcon.edev; > + It would be useful to report the current with POWER_SUPPLY_PROP_* but it is a different patch. > + if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) { > + dev_dbg(charger->dev, "USB SDP charger is connected\n"); > + current_limit = 450000; > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) { > + dev_dbg(charger->dev, "USB DCP charger is connected\n"); > + current_limit = 650000; > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) { > + dev_dbg(charger->dev, "USB FAST charger is connected\n"); > + current_limit = 650000; > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) { > + dev_dbg(charger->dev, "USB SLOW charger is connected\n"); > + current_limit = 650000; The charger provides 500 mA, so I wonder whether 650 here is correct. Is it at different voltage? > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) { > + dev_dbg(charger->dev, "USB CDP charger is connected\n"); > + current_limit = 650000; > + } else { > + dev_dbg(charger->dev, "USB charger is diconnected\n"); > + current_limit = -1; > + } > + > + if (current_limit > 0) { ret should be declared here. > + ret = regulator_set_current_limit(charger->reg, current_limit, current_limit); > + if (ret) > + dev_err(charger->dev, "failed to set current limit: %d\n", ret); Failure of setting the current should rather disable the charging. > + ret = regulator_enable(charger->reg); > + if (ret) > + dev_err(charger->dev, "failed to enable regulator: %d\n", ret); > + } else { ret should be declared here. > + ret = regulator_disable(charger->reg); > + if (ret) > + dev_err(charger->dev, "failed to disable regulator: %d\n", ret); > + } What about top-off charging? > +} > + > +static int max8997_battery_extcon_evt(struct notifier_block *nb, > + unsigned long event, void *param) > +{ > + struct charger_data *charger = > + container_of(nb, struct charger_data, extcon.nb); > + schedule_work(&charger->extcon.work); > + return NOTIFY_OK; > +} > + > static const struct power_supply_desc max8997_battery_desc = { > .name = "max8997_pmic", > .type = POWER_SUPPLY_TYPE_BATTERY, > @@ -104,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev) > struct i2c_client *i2c = iodev->i2c; > struct max8997_platform_data *pdata = iodev->pdata; > struct power_supply_config psy_cfg = {}; > + struct extcon_dev *edev; > > if (!pdata) { > dev_err(&pdev->dev, "No platform data supplied.\n"); > @@ -151,6 +216,12 @@ static int max8997_battery_probe(struct platform_device *pdev) > return ret; > } > > + edev = extcon_get_extcon_dev("max8997-muic"); Store it directly under charger->edev. > + if (edev == NULL) { if (!edev) { > + dev_info(&pdev->dev, "extcon is not ready, probe deferred\n"); Do not print anything on deferrals. > + return -EPROBE_DEFER; > + } > + > charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL); > if (!charger) > return -ENOMEM; > @@ -170,6 +241,27 @@ static int max8997_battery_probe(struct platform_device *pdev) > return PTR_ERR(charger->battery); > } > > + charger->reg = regulator_get(&pdev->dev, "CHARGER"); Here and in extcon_get_extcon_dev() - you make all these devices tightly coupled. It will work, but I am afraid it's easy to break later. Instead you should have a device node in DTS to which the charger could bind and where the driver will find regulator supply and extcon phandles (with extcon_get_edev_by_phandle() for example). > + if (IS_ERR(charger->reg)) { > + dev_err(&pdev->dev, "couldn't get CHARGER regulator\n"); > + return PTR_ERR(charger->reg); > + } > + > + INIT_WORK(&charger->extcon.work, max8997_battery_extcon_evt_worker); > + ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger); > + if (ret) { > + dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret); Missing regulator_put() here and in other places. Use devm-(). > + return ret; > + } > + charger->extcon.edev = edev; > + charger->extcon.nb.notifier_call = max8997_battery_extcon_evt; > + ret = devm_extcon_register_notifier_all(&pdev->dev, charger->extcon.edev, > + &charger->extcon.nb); Align the arguments with opening '('. Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel