Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 16 Nov 2022 12:05:56 +0200
From:   Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
To:     Matti Vaittinen <mazziesaccount@gmail.com>,
        Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Cc:     Sebastian Reichel <sre@kernel.org>, linux-pm@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] power: supply: 88pm860x: simplify using devm
Message-ID: <Y3S2BPJC+jLLN59z@dc75zzyyyyyyyyyyyyydt-3.rev.dnainternet.fi>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="tiDKVUK3dZKOLXxl"
Content-Disposition: inline
Precedence: bulk


--tiDKVUK3dZKOLXxl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Use devm variants for requesting threaded IRQ and for power-supply
registration. Clean up error path and remove the .remove-callback.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>

---
Oh, found this commit while cleaning-up my local git branches. Seems
like I never got around sending this?

Please note, commit is untested as I don't have the 88pm860x HW
---
 drivers/power/supply/88pm860x_charger.c | 38 ++++++-------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/drivers/power/supply/88pm860x_charger.c b/drivers/power/supply=
/88pm860x_charger.c
index f21ce52fbc04..2b9fcb7e71d7 100644
--- a/drivers/power/supply/88pm860x_charger.c
+++ b/drivers/power/supply/88pm860x_charger.c
@@ -690,8 +690,7 @@ static int pm860x_charger_probe(struct platform_device =
*pdev)
 	    (chip->id =3D=3D CHIP_PM8607) ? chip->companion : chip->client;
 	if (!info->i2c_8606) {
 		dev_err(&pdev->dev, "Missed I2C address of 88PM8606!\n");
-		ret =3D -EINVAL;
-		goto out;
+		return -EINVAL;
 	}
 	info->dev =3D &pdev->dev;
=20
@@ -704,44 +703,26 @@ static int pm860x_charger_probe(struct platform_devic=
e *pdev)
 	psy_cfg.drv_data =3D info;
 	psy_cfg.supplied_to =3D pm860x_supplied_to;
 	psy_cfg.num_supplicants =3D ARRAY_SIZE(pm860x_supplied_to);
-	info->usb =3D power_supply_register(&pdev->dev, &pm860x_charger_desc,
-					  &psy_cfg);
+	info->usb =3D devm_power_supply_register(&pdev->dev, &pm860x_charger_desc,
+					       &psy_cfg);
 	if (IS_ERR(info->usb)) {
-		ret =3D PTR_ERR(info->usb);
-		goto out;
+		return PTR_ERR(info->usb);
 	}
=20
 	pm860x_init_charger(info);
=20
 	for (i =3D 0; i < ARRAY_SIZE(info->irq); i++) {
-		ret =3D request_threaded_irq(info->irq[i], NULL,
-			pm860x_irq_descs[i].handler,
-			IRQF_ONESHOT, pm860x_irq_descs[i].name, info);
+		ret =3D devm_request_threaded_irq(&pdev->dev, info->irq[i], NULL,
+						pm860x_irq_descs[i].handler,
+						IRQF_ONESHOT,
+						pm860x_irq_descs[i].name, info);
 		if (ret < 0) {
 			dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
 				info->irq[i], ret);
-			goto out_irq;
+			return ret;
 		}
 	}
 	return 0;
-
-out_irq:
-	power_supply_unregister(info->usb);
-	while (--i >=3D 0)
-		free_irq(info->irq[i], info);
-out:
-	return ret;
-}
-
-static int pm860x_charger_remove(struct platform_device *pdev)
-{
-	struct pm860x_charger_info *info =3D platform_get_drvdata(pdev);
-	int i;
-
-	power_supply_unregister(info->usb);
-	for (i =3D 0; i < info->irq_nums; i++)
-		free_irq(info->irq[i], info);
-	return 0;
 }
=20
 static struct platform_driver pm860x_charger_driver =3D {
@@ -749,7 +730,6 @@ static struct platform_driver pm860x_charger_driver =3D=
 {
 		   .name =3D "88pm860x-charger",
 	},
 	.probe =3D pm860x_charger_probe,
-	.remove =3D pm860x_charger_remove,
 };
 module_platform_driver(pm860x_charger_driver);
=20

base-commit: 094226ad94f471a9f19e8f8e7140a09c2625abaa
--=20
2.38.1


--=20
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =3D]=20

--tiDKVUK3dZKOLXxl
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEIx+f8wZb28fLKEhTeFA3/03aocUFAmN0tgAACgkQeFA3/03a
ocXyXgf+OUGV4IQkSWIAnFyABpjUWCecJIV9WtoTTNDLi2Y/kq//Pc9UWANmvgPD
FOQfL8tJPXiKg4Gpofnh8U2E4tMD4Z5bwAj6dJtOHNUs2Ecyly0DzAeCCY315xNB
MA10RujvxDYfU3tBN4cuk+LSlwwXhXhxp6tD0tp+4OzPpAkq9G8PEVq4Y28Qba+9
rlKKw/L6CBPqytUXqykibgpTKGur3UNjylpWmSN8C1ZONztrwCOMj3dmmiTCUncT
EylZpRIx8ejJOqMT2ri26DExSlkcuQzPUIZ144Lt+rfJtWORff1nREOfh+UEY+Pv
+hNs0i3yrr8pEi/5f9lF+rQv6jexew==
=6GTB
-----END PGP SIGNATURE-----

--tiDKVUK3dZKOLXxl--