Received-SPF: pass (google.com: domain of linux-kernel+bounces-90362-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <b5f9c66e-d9c8-4dc6-8ce5-8d1dc5f0782d@web.de>
Date: Mon, 4 Mar 2024 10:55:11 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: [PATCH v2] Input: iqs269a - Use scope-based resource management in
 iqs269_parse_chan()
To: linux-input@vger.kernel.org, kernel-janitors@vger.kernel.org,
 Dmitry Torokhov <dmitry.torokhov@gmail.com>, Jeff LaBundy
 <jeff@labundy.com>, Mattijs Korpershoek <mkorpershoek@baylibre.com>,
 Rob Herring <robh@kernel.org>,
 =?UTF-8?Q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>,
 ye xingchen <ye.xingchen@zte.com.cn>
Cc: LKML <linux-kernel@vger.kernel.org>,
 Jonathan Cameron <Jonathan.Cameron@huawei.com>
References: <6bf9f962-cf75-459d-89f4-2546063fc154@web.de>
 <ZeT6UUFNq1ujMW17@google.com>
Content-Language: en-GB
From: Markus Elfring <Markus.Elfring@web.de>
In-Reply-To: <ZeT6UUFNq1ujMW17@google.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:M3fBihiZ3/M=;6dsTCfsvsglmme9bdNMzy5cxJBp
 nO3I7HSl6I7Cs72oMggwnpaXoZ9USrn/YicGy5Ghyn74wznYK4XzgjjkdeoKP9EPzw8aRqGc2
 UH6cmMlf4awa85fRZ9LgNSo2w5t4nHhdgwsnkpIG4rZs6BQbt+cCSYiCfDJhdnfmfWBzSfH7K
 QlnagVRADFLoY5Pj1x/Ftvx1WTrE2pdRBHiSF2jcAUaP8BKlIamjWgaVITFoeKIsPAKIzxUK4
 ypn1yy7wfxIYcUotBqJasvq7Avg8aFfpwUaAO1Gs1fxP2zKK/8o5w6xps/ubEgigzEXN/BZA5
 UzkMMJJG2fjkphlzGiyCYGInBdzMtjvOSwuqfGnOS9csvDsjKtlmca4VgUHfqUerLBmTrb4X3
 uyd9yXZP+yd9JzIzINqXK0ob8Zi8mjoTdNbmJyeZVTFY+g1tY9luQq0/Fg6K1ydS3PALvo2fA
 9+VjsSfKSrv7Zz9EXXzHV22swgxvgK9yBXS9Tq110ose9K3BY2sCRnAZVGy8HSndD+tSzjmyS
 XE+9sDhD90JfSorFAWVjHOV/9godxVFC0qYDcTlLsYty5Dr5nPPwF8gLgKGFvcVFOBG2CC0Pn
 18tLE5MfrihpfEdtgcLIfLzNlGaniimTGtiAxZp88gQGxrV3pNDK34aFTbjBqPUfvL69olBlE
 TD8Qo+dvKLoeqjuQV7psU6FebbvpZN9RoRofkoCTD/yq7GoCAH7n32MwLLK8GUFxZ9Alh8hQu
 TNoFodgLg4wDDPZusgIziFzA1JIhK6GxE4KlZjmKGtCodjRs1t1A8y6ALDL8DqtZR+Eh5tJoz
 GP1+8gVnao6bo31EB2ie3g+VqZU8cvZDwA1OJtaTkjVDQ=

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 4 Mar 2024 10:30:52 +0100

Scope-based resource management became supported also for this software
area by contributions of Jonathan Cameron on 2024-02-17.

device property: Add cleanup.h based fwnode_handle_put() scope based clean=
up.
https://lore.kernel.org/r/20240217164249.921878-3-jic23@kernel.org


* Thus use the attribute =E2=80=9C__free(fwnode_handle)=E2=80=9D.

* Reduce the scope for the local variable =E2=80=9Cev_node=E2=80=9D into a=
 for loop.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
=2D--

v2:
An other cleanup technique was applied as requested by Dmitry Torokhov.


 drivers/input/misc/iqs269a.c | 73 ++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/drivers/input/misc/iqs269a.c b/drivers/input/misc/iqs269a.c
index cd14ff9f57cf..9caee936927b 100644
=2D-- a/drivers/input/misc/iqs269a.c
+++ b/drivers/input/misc/iqs269a.c
@@ -557,7 +557,6 @@ static int iqs269_parse_chan(struct iqs269_private *iq=
s269,
 			     const struct fwnode_handle *ch_node)
 {
 	struct i2c_client *client =3D iqs269->client;
-	struct fwnode_handle *ev_node;
 	struct iqs269_ch_reg *ch_reg;
 	u16 engine_a, engine_b;
 	unsigned int reg, val;
@@ -734,47 +733,49 @@ static int iqs269_parse_chan(struct iqs269_private *=
iqs269,
 	}

 	for (i =3D 0; i < ARRAY_SIZE(iqs269_events); i++) {
-		ev_node =3D fwnode_get_named_child_node(ch_node,
-						      iqs269_events[i].name);
-		if (!ev_node)
-			continue;
-
-		if (!fwnode_property_read_u32(ev_node, "azoteq,thresh", &val)) {
-			if (val > IQS269_CHx_THRESH_MAX) {
-				dev_err(&client->dev,
-					"Invalid channel %u threshold: %u\n",
-					reg, val);
-				fwnode_handle_put(ev_node);
-				return -EINVAL;
+		{
+			struct fwnode_handle *ev_node __free(fwnode_handle)
+						      =3D fwnode_get_named_child_node(ch_node,
+										    iqs269_events[i].name);
+
+			if (!ev_node)
+				continue;
+
+			if (!fwnode_property_read_u32(ev_node, "azoteq,thresh", &val)) {
+				if (val > IQS269_CHx_THRESH_MAX) {
+					dev_err(&client->dev,
+						"Invalid channel %u threshold: %u\n",
+						reg, val);
+					return -EINVAL;
+				}
+
+				ch_reg->thresh[iqs269_events[i].th_offs] =3D val;
 			}

-			ch_reg->thresh[iqs269_events[i].th_offs] =3D val;
-		}
-
-		if (!fwnode_property_read_u32(ev_node, "azoteq,hyst", &val)) {
-			u8 *hyst =3D &ch_reg->hyst;
-
-			if (val > IQS269_CHx_HYST_MAX) {
-				dev_err(&client->dev,
-					"Invalid channel %u hysteresis: %u\n",
-					reg, val);
-				fwnode_handle_put(ev_node);
-				return -EINVAL;
+			if (!fwnode_property_read_u32(ev_node, "azoteq,hyst", &val)) {
+				u8 *hyst =3D &ch_reg->hyst;
+
+				if (val > IQS269_CHx_HYST_MAX) {
+					dev_err(&client->dev,
+						"Invalid channel %u hysteresis: %u\n",
+						reg, val);
+					return -EINVAL;
+				}
+
+				if (i =3D=3D IQS269_EVENT_DEEP_DN ||
+				    i =3D=3D IQS269_EVENT_DEEP_UP) {
+					*hyst &=3D ~IQS269_CHx_HYST_DEEP_MASK;
+					*hyst |=3D (val << IQS269_CHx_HYST_DEEP_SHIFT);
+				} else if (i =3D=3D IQS269_EVENT_TOUCH_DN ||
+					   i =3D=3D IQS269_EVENT_TOUCH_UP) {
+					*hyst &=3D ~IQS269_CHx_HYST_TOUCH_MASK;
+					*hyst |=3D val;
+				}
 			}

-			if (i =3D=3D IQS269_EVENT_DEEP_DN ||
-			    i =3D=3D IQS269_EVENT_DEEP_UP) {
-				*hyst &=3D ~IQS269_CHx_HYST_DEEP_MASK;
-				*hyst |=3D (val << IQS269_CHx_HYST_DEEP_SHIFT);
-			} else if (i =3D=3D IQS269_EVENT_TOUCH_DN ||
-				   i =3D=3D IQS269_EVENT_TOUCH_UP) {
-				*hyst &=3D ~IQS269_CHx_HYST_TOUCH_MASK;
-				*hyst |=3D val;
-			}
+			error =3D fwnode_property_read_u32(ev_node, "linux,code", &val);
 		}

-		error =3D fwnode_property_read_u32(ev_node, "linux,code", &val);
-		fwnode_handle_put(ev_node);
 		if (error =3D=3D -EINVAL) {
 			continue;
 		} else if (error) {
=2D-
2.44.0