From: Krzysztof Kozlowski <krzk@kernel.org>
To: Timon Baetz <timon.baetz@protonmail.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Sebastian Reichel <sre@kernel.org>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH 3/3] power: supply: max8997_charger: Switch to new binding
Date: Sun, 31 Jan 2021 18:28:40 +0100 [thread overview]
Message-ID: <20210131172840.fxaadhhsafa4aeex@kozik-lap> (raw)
In-Reply-To: <20210130172747.2022977-4-timon.baetz@protonmail.com>
On Sat, Jan 30, 2021 at 05:30:14PM +0000, Timon Baetz wrote:
> Get regulator from parent device's node and extcon by name.
>
> Signed-off-by: Timon Baetz <timon.baetz@protonmail.com>
> ---
> drivers/power/supply/max8997_charger.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
> index 321bd6b8ee41..625d8cc4312a 100644
> --- a/drivers/power/supply/max8997_charger.c
> +++ b/drivers/power/supply/max8997_charger.c
> @@ -168,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev)
> int ret = 0;
> struct charger_data *charger;
> struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
> + struct device_node *np = pdev->dev.of_node;
> struct i2c_client *i2c = iodev->i2c;
> struct max8997_platform_data *pdata = iodev->pdata;
> struct power_supply_config psy_cfg = {};
> @@ -237,20 +238,23 @@ static int max8997_battery_probe(struct platform_device *pdev)
> return PTR_ERR(charger->battery);
> }
>
> + // grab regulator from parent device's node
> + pdev->dev.of_node = iodev->dev->of_node;
> charger->reg = devm_regulator_get_optional(&pdev->dev, "charger");
> + pdev->dev.of_node = np;
I think the device does not have its own node anymore. Or did I miss
something?
> if (IS_ERR(charger->reg)) {
> if (PTR_ERR(charger->reg) == -EPROBE_DEFER)
> return -EPROBE_DEFER;
> dev_info(&pdev->dev, "couldn't get charger regulator\n");
> }
> - charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0);
> - if (IS_ERR(charger->edev)) {
> - if (PTR_ERR(charger->edev) == -EPROBE_DEFER)
> + charger->edev = extcon_get_extcon_dev("max8997-muic");
> + if (IS_ERR_OR_NULL(charger->edev)) {
> + if (!charger->edev)
Isn't NULL returned when there is simply no extcon? It's different than
deferred probe. Returning here EPROBE_DEFER might lead to infinite probe
tries (on every new device probe) instead of just failing it.
Best regards,
Krzysztof
> return -EPROBE_DEFER;
> dev_info(charger->dev, "couldn't get extcon device\n");
> }
>
> - if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) {
> + if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
> 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) {
> --
> 2.25.1
>
>
next prev parent reply other threads:[~2021-01-31 20:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-30 17:28 [PATCH 0/3] charger-supply for max8997_charger Timon Baetz
2021-01-30 17:29 ` [PATCH 1/3] regulator: dt-bindings: Document charger-supply for max8997 Timon Baetz
2021-01-30 17:29 ` [PATCH 2/3] ARM: dts: exynos: Add charger supply for I9100 Timon Baetz
2021-02-11 5:59 ` Timon Baetz
2021-02-11 7:39 ` Krzysztof Kozlowski
2021-03-02 8:52 ` Krzysztof Kozlowski
2021-01-30 17:30 ` [PATCH 3/3] power: supply: max8997_charger: Switch to new binding Timon Baetz
2021-01-31 17:28 ` Krzysztof Kozlowski [this message]
2021-02-01 9:26 ` Timon Baetz
2021-02-01 18:03 ` Krzysztof Kozlowski
2021-03-09 7:47 ` Timon Baetz
2021-03-26 16:20 ` Timon Baetz
2021-02-03 21:07 ` (subset) [PATCH 0/3] charger-supply for max8997_charger Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210131172840.fxaadhhsafa4aeex@kozik-lap \
--to=krzk@kernel.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=timon.baetz@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).