Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 29 Mar 2021 14:38:02 +0000
To:     Sebastian Reichel <sre@kernel.org>
From:   Timon Baetz <timon.baetz@protonmail.com>
Cc:     linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>,
        Timon Baetz <timon.baetz@protonmail.com>
Reply-To: Timon Baetz <timon.baetz@protonmail.com>
Subject: [PATCH v2 1/1] power: supply: max8997_charger: Switch to new binding
Message-ID: <20210329143715.806981-2-timon.baetz@protonmail.com>
In-Reply-To: <20210329143715.806981-1-timon.baetz@protonmail.com>
References: <20210329143715.806981-1-timon.baetz@protonmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Get regulator from parent device's node and extcon by name.

Signed-off-by: Timon Baetz <timon.baetz@protonmail.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 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 a90c01884026..25207fe2aa68 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)
 =09int ret =3D 0;
 =09struct charger_data *charger;
 =09struct max8997_dev *iodev =3D dev_get_drvdata(pdev->dev.parent);
+=09struct device_node *np =3D pdev->dev.of_node;
 =09struct i2c_client *i2c =3D iodev->i2c;
 =09struct max8997_platform_data *pdata =3D iodev->pdata;
 =09struct power_supply_config psy_cfg =3D {};
@@ -237,20 +238,23 @@ static int max8997_battery_probe(struct platform_devi=
ce *pdev)
 =09=09return PTR_ERR(charger->battery);
 =09}

+=09// grab regulator from parent device's node
+=09pdev->dev.of_node =3D iodev->dev->of_node;
 =09charger->reg =3D devm_regulator_get_optional(&pdev->dev, "charger");
+=09pdev->dev.of_node =3D np;
 =09if (IS_ERR(charger->reg)) {
 =09=09if (PTR_ERR(charger->reg) =3D=3D -EPROBE_DEFER)
 =09=09=09return -EPROBE_DEFER;
 =09=09dev_info(&pdev->dev, "couldn't get charger regulator\n");
 =09}
-=09charger->edev =3D extcon_get_edev_by_phandle(&pdev->dev, 0);
-=09if (IS_ERR(charger->edev)) {
-=09=09if (PTR_ERR(charger->edev) =3D=3D -EPROBE_DEFER)
+=09charger->edev =3D extcon_get_extcon_dev("max8997-muic");
+=09if (IS_ERR_OR_NULL(charger->edev)) {
+=09=09if (!charger->edev)
 =09=09=09return -EPROBE_DEFER;
 =09=09dev_info(charger->dev, "couldn't get extcon device\n");
 =09}

-=09if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) {
+=09if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
 =09=09INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
 =09=09ret =3D devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_=
work, charger);
 =09=09if (ret) {
--
2.25.1