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:   Fri, 19 Aug 2022 22:18:46 +0300
From:   Matti Vaittinen <mazziesaccount@gmail.com>
To:     Matti Vaittinen <mazziesaccount@gmail.com>,
        Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Cc:     Michael Hennerich <Michael.Hennerich@analog.com>,
        Jean Delvare <jdelvare@suse.com>,
        Guenter Roeck <linux@roeck-us.net>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>, linux-hwmon@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v3 05/14] hwmon: adm1177: simplify using
 devm_regulator_get_enable()
Message-ID: <718e4ea3a54c036dcb59ff55c338e253735e516b.1660934107.git.mazziesaccount@gmail.com>
References: <cover.1660934107.git.mazziesaccount@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="u4933oyvJYU7rlVS"
Content-Disposition: inline
In-Reply-To: <cover.1660934107.git.mazziesaccount@gmail.com>
Precedence: bulk


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

Drop open-coded pattern: 'devm_regulator_get(), regulator_enable(),
add_action_or_reset(regulator_disable)' and use the
devm_regulator_get_enable() and drop the pointer to the regulator.
This simplifies code and makes it less tempting to add manual control
for the regulator which is also controlled by devm.

Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>

---
v2 =3D> v3:
New patch
---
 drivers/hwmon/adm1177.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/drivers/hwmon/adm1177.c b/drivers/hwmon/adm1177.c
index 0c5dbc5e33b4..be17a26a84f1 100644
--- a/drivers/hwmon/adm1177.c
+++ b/drivers/hwmon/adm1177.c
@@ -26,14 +26,12 @@
 /**
  * struct adm1177_state - driver instance specific data
  * @client:		pointer to i2c client
- * @reg:		regulator info for the power supply of the device
  * @r_sense_uohm:	current sense resistor value
  * @alert_threshold_ua:	current limit for shutdown
  * @vrange_high:	internal voltage divider
  */
 struct adm1177_state {
 	struct i2c_client	*client;
-	struct regulator	*reg;
 	u32			r_sense_uohm;
 	u32			alert_threshold_ua;
 	bool			vrange_high;
@@ -189,13 +187,6 @@ static const struct hwmon_chip_info adm1177_chip_info =
=3D {
 	.info =3D adm1177_info,
 };
=20
-static void adm1177_remove(void *data)
-{
-	struct adm1177_state *st =3D data;
-
-	regulator_disable(st->reg);
-}
-
 static int adm1177_probe(struct i2c_client *client)
 {
 	struct device *dev =3D &client->dev;
@@ -210,21 +201,9 @@ static int adm1177_probe(struct i2c_client *client)
=20
 	st->client =3D client;
=20
-	st->reg =3D devm_regulator_get_optional(&client->dev, "vref");
-	if (IS_ERR(st->reg)) {
-		if (PTR_ERR(st->reg) =3D=3D -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		st->reg =3D NULL;
-	} else {
-		ret =3D regulator_enable(st->reg);
-		if (ret)
-			return ret;
-		ret =3D devm_add_action_or_reset(&client->dev, adm1177_remove,
-					       st);
-		if (ret)
-			return ret;
-	}
+	ret =3D devm_regulator_get_enable_optional(&client->dev, "vref");
+	if (ret =3D=3D -EPROBE_DEFER)
+		return -EPROBE_DEFER;
=20
 	if (device_property_read_u32(dev, "shunt-resistor-micro-ohms",
 				     &st->r_sense_uohm))
--=20
2.37.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

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

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

iQEzBAEBCAAdFiEEIx+f8wZb28fLKEhTeFA3/03aocUFAmL/4hUACgkQeFA3/03a
ocUNjwgAyCPy737spbVpgQaN6ZKyydBYYE2OFVzkMXRTIRlB7/POi3ZdPDiZTgcP
RUMt/nprmh1Gq6OgTbcXoI3hLcqdMAIYZy+JOV02zhqfDvFHPpex2TnTvi39546n
fDzS83O9DJqMs9RutKxZnpU1ZJqFa1BYQN9jy3dJmAdjKK8un47/QILBWnTJoH0Z
NE0cMUFjulUyV6HwG+OJ62z6mjiMaYHHiY3K5jo48Jo3UGmXWI3eLUbUXdIugnZb
RLtmax91JSbEFCTYQIB6qVnyBD1Foe2Sr14ZB4919p7hEZUWXrLeOSrQIJA7FpFJ
oTzFozHrx1gQKXg3dwMYAS9clqWfAA==
=jkTb
-----END PGP SIGNATURE-----

--u4933oyvJYU7rlVS--