From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 21 Aug 2024 22:48:31 +0000 (-0700)
Subject: Input: iqs7211 - use cleanup facility for fwnodes
X-Git-Tag: v7.1-rc1~44^2^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3092610fdc62b798f648b6de59a83ecd70315913;p=thirdparty%2Flinux.git

Input: iqs7211 - use cleanup facility for fwnodes

Use __free(fwnode_handle) cleanup facility to ensure that references to
acquired fwnodes are dropped at appropriate times automatically.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

diff --git a/drivers/input/touchscreen/iqs7211.c b/drivers/input/touchscreen/iqs7211.c
index c5d447ee6f53..26e0b501c5fc 100644
--- a/drivers/input/touchscreen/iqs7211.c
+++ b/drivers/input/touchscreen/iqs7211.c
@@ -2060,19 +2060,16 @@ static int iqs7211_parse_reg_grp(struct iqs7211_private *iqs7211,
 
 	for (i = 0; i < dev_desc->num_kp_events; i++) {
 		const char *event_name = dev_desc->kp_events[i].name;
-		struct fwnode_handle *event_node;
 
 		if (dev_desc->kp_events[i].reg_grp != reg_grp)
 			continue;
 
 		reg_field.mask |= dev_desc->kp_events[i].enable;
 
-		if (event_name)
-			event_node = fwnode_get_named_child_node(reg_grp_node,
-								 event_name);
-		else
-			event_node = fwnode_handle_get(reg_grp_node);
-
+		struct fwnode_handle *event_node __free(fwnode_handle) =
+			event_name ? fwnode_get_named_child_node(reg_grp_node,
+								 event_name) :
+				     fwnode_handle_get(reg_grp_node);
 		if (!event_node)
 			continue;
 
@@ -2080,7 +2077,6 @@ static int iqs7211_parse_reg_grp(struct iqs7211_private *iqs7211,
 					    dev_desc->kp_events[i].reg_grp,
 					    dev_desc->kp_events[i].reg_key,
 					    &iqs7211->kp_code[i]);
-		fwnode_handle_put(event_node);
 		if (error)
 			return error;
 
@@ -2496,19 +2492,15 @@ static int iqs7211_probe(struct i2c_client *client)
 
 	for (reg_grp = 0; reg_grp < IQS7211_NUM_REG_GRPS; reg_grp++) {
 		const char *reg_grp_name = iqs7211_reg_grp_names[reg_grp];
-		struct fwnode_handle *reg_grp_node;
-
-		if (reg_grp_name)
-			reg_grp_node = device_get_named_child_node(&client->dev,
-								   reg_grp_name);
-		else
-			reg_grp_node = fwnode_handle_get(dev_fwnode(&client->dev));
 
+		struct fwnode_handle *reg_grp_node __free(fwnode_handle) =
+			reg_grp_name ? device_get_named_child_node(&client->dev,
+								   reg_grp_name) :
+				       fwnode_handle_get(dev_fwnode(&client->dev));
 		if (!reg_grp_node)
 			continue;
 
 		error = iqs7211_parse_reg_grp(iqs7211, reg_grp_node, reg_grp);
-		fwnode_handle_put(reg_grp_node);
 		if (error)
 			return error;
 	}