Skip to contentSkip to conversation

IIO: Use device_for_each_child_scope()

PATCH RESEND In review Jonathan Cameron 3 participants 7 messages Apr 28, 2024 – Apr 29, 2024

Subsystems (2)
lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

v6 cover IIO: Use device_for_each_child_scope()

From: Jonathan Cameron <[email protected]>

Looking for review of these remaining patches from v6. Chances since V6 (dropped the ones that I applied):

I'm slimming this series down by taking patches that have been reviewed but nothing yet on these ones yet. They are fairly simple so if anyone has time to look that would be great.

Jonathan Cameron (2):
iio: adc: mcp3564: Use device_for_each_child_node_scoped()
iio: adc: ti-ads1015: Use device_for_each_child_node_scoped()

 drivers/iio/adc/mcp3564.c    | 16 +++++++---------
 drivers/iio/adc/ti-ads1015.c |  5 +----
 2 files changed, 8 insertions(+), 13 deletions(-)
Signature · 1 line
2.44.0
author maintainer
#1 lore raw

PATCH v6 1/2 iio: adc: mcp3564: Use device_for_each_child_node_scoped()

From: Jonathan Cameron <[email protected]>

Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths.

---
 drivers/iio/adc/mcp3564.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/iio/adc/mcp3564.c +7 -9
index 311b613b6057..e2ae13f1e842 100644
@@ -998,7 +998,6 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	struct mcp3564_state *adc = iio_priv(indio_dev);
 	struct device *dev = &adc->spi->dev;
 	struct iio_chan_spec *channels;
-	struct fwnode_handle *child;
 	struct iio_chan_spec chanspec = mcp3564_channel_template;
 	struct iio_chan_spec temp_chanspec = mcp3564_temp_channel_template;
 	struct iio_chan_spec burnout_chanspec = mcp3564_burnout_channel_template;
@@ -1025,7 +1024,7 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	if (!channels)
 		return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");
 
-	device_for_each_child_node(dev, child) {
+	device_for_each_child_node_scoped(dev, child) {
 		node_name = fwnode_get_name(child);
 
 		if (fwnode_property_present(child, "diff-channels")) {
@@ -1033,26 +1032,25 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 							     "diff-channels",
 							     inputs,
 							     ARRAY_SIZE(inputs));
+			if (ret)
+				return ret;
+
 			chanspec.differential = 1;
 		} else {
 			ret = fwnode_property_read_u32(child, "reg", &inputs[0]);
+			if (ret)
+				return ret;
 
 			chanspec.differential = 0;
 			inputs[1] = MCP3564_AGND;
 		}
-		if (ret) {
-			fwnode_handle_put(child);
-			return ret;
-		}
 
 		if (inputs[0] > MCP3564_INTERNAL_VCM ||
-		    inputs[1] > MCP3564_INTERNAL_VCM) {
-			fwnode_handle_put(child);
+		    inputs[1] > MCP3564_INTERNAL_VCM)
 			return dev_err_probe(&indio_dev->dev, -EINVAL,
 					     "Channel index > %d, for %s\n",
 					     MCP3564_INTERNAL_VCM + 1,
 					     node_name);
-		}
 
 		chanspec.address = (inputs[0] << 4) | inputs[1];
 		chanspec.channel = inputs[0];
Signature · 1 line
2.44.0
Reviewed-by on v6 1/2
#2 lore raw

Re: [PATCH v6 1/2] iio: adc: mcp3564: Use device_for_each_child_node_scoped()

Hi Jonathan,

This also looks good to me.

Quoted 70 lines · Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths.

---
 drivers/iio/adc/mcp3564.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/iio/adc/mcp3564.c +7 -9
index 311b613b6057..e2ae13f1e842 100644
@@ -998,7 +998,6 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	struct mcp3564_state *adc = iio_priv(indio_dev);
 	struct device *dev = &adc->spi->dev;
 	struct iio_chan_spec *channels;
-	struct fwnode_handle *child;
 	struct iio_chan_spec chanspec = mcp3564_channel_template;
 	struct iio_chan_spec temp_chanspec = mcp3564_temp_channel_template;
 	struct iio_chan_spec burnout_chanspec = mcp3564_burnout_channel_template;
@@ -1025,7 +1024,7 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	if (!channels)
 		return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");
 
-	device_for_each_child_node(dev, child) {
+	device_for_each_child_node_scoped(dev, child) {
 		node_name = fwnode_get_name(child);
 
 		if (fwnode_property_present(child, "diff-channels")) {
@@ -1033,26 +1032,25 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 							     "diff-channels",
 							     inputs,
 							     ARRAY_SIZE(inputs));
+			if (ret)
+				return ret;
+
 			chanspec.differential = 1;
 		} else {
 			ret = fwnode_property_read_u32(child, "reg", &inputs[0]);
+			if (ret)
+				return ret;
 
 			chanspec.differential = 0;
 			inputs[1] = MCP3564_AGND;
 		}
-		if (ret) {
-			fwnode_handle_put(child);
-			return ret;
-		}
 
 		if (inputs[0] > MCP3564_INTERNAL_VCM ||
-		    inputs[1] > MCP3564_INTERNAL_VCM) {
-			fwnode_handle_put(child);
+		    inputs[1] > MCP3564_INTERNAL_VCM)
 			return dev_err_probe(&indio_dev->dev, -EINVAL,
 					     "Channel index > %d, for %s\n",
 					     MCP3564_INTERNAL_VCM + 1,
 					     node_name);
-		}
 
 		chanspec.address = (inputs[0] << 4) | inputs[1];
 		chanspec.channel = inputs[0];
Signature · 1 line
2.44.0
author maintainer Applied
#3 lore raw

Re: [PATCH v6 1/2] iio: adc: mcp3564: Use device_for_each_child_node_scoped()

Quoted 5 lines · On Sun, 28 Apr 2024 17:25:57 -0300 Marcelo Schmitt…

Hi Jonathan,

This also looks good to me.

Thanks,

Applied.

1 to go. Someone must want to give the ads1015 patch the love it needs? :)

Jonathan

Quoted 73 lines · Jonathan Cameron
Quoted 70 lines

From: Jonathan Cameron <[email protected]>

Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths.

---
 drivers/iio/adc/mcp3564.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/iio/adc/mcp3564.c +7 -9
index 311b613b6057..e2ae13f1e842 100644
@@ -998,7 +998,6 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	struct mcp3564_state *adc = iio_priv(indio_dev);
 	struct device *dev = &adc->spi->dev;
 	struct iio_chan_spec *channels;
-	struct fwnode_handle *child;
 	struct iio_chan_spec chanspec = mcp3564_channel_template;
 	struct iio_chan_spec temp_chanspec = mcp3564_temp_channel_template;
 	struct iio_chan_spec burnout_chanspec = mcp3564_burnout_channel_template;
@@ -1025,7 +1024,7 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	if (!channels)
 		return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");
 
-	device_for_each_child_node(dev, child) {
+	device_for_each_child_node_scoped(dev, child) {
 		node_name = fwnode_get_name(child);
 
 		if (fwnode_property_present(child, "diff-channels")) {
@@ -1033,26 +1032,25 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 							     "diff-channels",
 							     inputs,
 							     ARRAY_SIZE(inputs));
+			if (ret)
+				return ret;
+
 			chanspec.differential = 1;
 		} else {
 			ret = fwnode_property_read_u32(child, "reg", &inputs[0]);
+			if (ret)
+				return ret;
 
 			chanspec.differential = 0;
 			inputs[1] = MCP3564_AGND;
 		}
-		if (ret) {
-			fwnode_handle_put(child);
-			return ret;
-		}
 
 		if (inputs[0] > MCP3564_INTERNAL_VCM ||
-		    inputs[1] > MCP3564_INTERNAL_VCM) {
-			fwnode_handle_put(child);
+		    inputs[1] > MCP3564_INTERNAL_VCM)
 			return dev_err_probe(&indio_dev->dev, -EINVAL,
 					     "Channel index > %d, for %s\n",
 					     MCP3564_INTERNAL_VCM + 1,
 					     node_name);
-		}
 
 		chanspec.address = (inputs[0] << 4) | inputs[1];
 		chanspec.channel = inputs[0];
Signature · 1 line
2.44.0
author maintainer
#4 lore raw

Re: [PATCH v6 1/2] iio: adc: mcp3564: Use device_for_each_child_node_scoped()

Quoted 7 lines · On Mon, 29 Apr 2024 20:56:23 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 4 lines · On Sun, 28 Apr 2024 17:25:57 -0300 Marcelo Schmitt…

Hi Jonathan,

This also looks good to me.

Quoted 7 lines
Quoted 1 line

Thanks,

Applied.

1 to go. Someone must want to give the ads1015 patch the love it needs? :)

Ah. There was another patch for the same driver doing the same thing. I picked that one up instead. Problem solved.

Jonathan

Quoted 77 lines

Jonathan

Quoted 73 lines · Jonathan Cameron
Quoted 70 lines

From: Jonathan Cameron <[email protected]>

Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths.

---
 drivers/iio/adc/mcp3564.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/iio/adc/mcp3564.c +7 -9
index 311b613b6057..e2ae13f1e842 100644
@@ -998,7 +998,6 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	struct mcp3564_state *adc = iio_priv(indio_dev);
 	struct device *dev = &adc->spi->dev;
 	struct iio_chan_spec *channels;
-	struct fwnode_handle *child;
 	struct iio_chan_spec chanspec = mcp3564_channel_template;
 	struct iio_chan_spec temp_chanspec = mcp3564_temp_channel_template;
 	struct iio_chan_spec burnout_chanspec = mcp3564_burnout_channel_template;
@@ -1025,7 +1024,7 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 	if (!channels)
 		return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");
 
-	device_for_each_child_node(dev, child) {
+	device_for_each_child_node_scoped(dev, child) {
 		node_name = fwnode_get_name(child);
 
 		if (fwnode_property_present(child, "diff-channels")) {
@@ -1033,26 +1032,25 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 							     "diff-channels",
 							     inputs,
 							     ARRAY_SIZE(inputs));
+			if (ret)
+				return ret;
+
 			chanspec.differential = 1;
 		} else {
 			ret = fwnode_property_read_u32(child, "reg", &inputs[0]);
+			if (ret)
+				return ret;
 
 			chanspec.differential = 0;
 			inputs[1] = MCP3564_AGND;
 		}
-		if (ret) {
-			fwnode_handle_put(child);
-			return ret;
-		}
 
 		if (inputs[0] > MCP3564_INTERNAL_VCM ||
-		    inputs[1] > MCP3564_INTERNAL_VCM) {
-			fwnode_handle_put(child);
+		    inputs[1] > MCP3564_INTERNAL_VCM)
 			return dev_err_probe(&indio_dev->dev, -EINVAL,
 					     "Channel index > %d, for %s\n",
 					     MCP3564_INTERNAL_VCM + 1,
 					     node_name);
-		}
 
 		chanspec.address = (inputs[0] << 4) | inputs[1];
 		chanspec.channel = inputs[0];
Signature · 1 line
2.44.0
maintainer Reviewed-by on v6 1/2
#5 lore raw

Re: [PATCH v6 1/2] iio: adc: mcp3564: Use device_for_each_child_node_scoped()

In reply to Jonathan Cameron

Hi Jonathan,

Quoted 80 lines · Jonathan Cameron

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

From: Jonathan Cameron <[email protected]>

Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths.

---
 drivers/iio/adc/mcp3564.c | 16 +++++++---------

 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/iio/adc/mcp3564.c +0 -1
index 311b613b6057..e2ae13f1e842 100644
@@ -998,7 +998,6 @@ static int mcp3564_parse_fw_children(struct
 iio_dev *indio_dev)
         struct mcp3564_state *adc = iio_priv(indio_dev);
         struct device *dev = &adc->spi->dev;
         struct iio_chan_spec *channels;
-       struct fwnode_handle *child;
         struct iio_chan_spec chanspec = mcp3564_channel_template;

        struct iio_chan_spec temp_chanspec =
mcp3564_temp_channel_template;
        struct iio_chan_spec burnout_chanspec =
mcp3564_burnout_channel_template;

drivers/iio/adc/mcp3564.c +0 -0
@@ -1025,7 +1024,7 @@ static int mcp3564_parse_fw_children(struct
 iio_dev *indio_dev)
         if (!channels)

                return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");

-       device_for_each_child_node(dev, child) { +       device_for_each_child_node_scoped(dev, child) { node_name = fwnode_get_name(child);

                if (fwnode_property_present(child, "diff-channels")) {

drivers/iio/adc/mcp3564.c +0 -0
@@ -1033,26 +1032,25 @@ static int mcp3564_parse_fw_children(struct
 iio_dev *indio_dev)

                                                             "diff- channels",
                                                             inputs,
ARRAY_SIZE(inputs));
+                       if (ret)
+                               return ret;
+
                        chanspec.differential = 1;
                } else {
                        ret = fwnode_property_read_u32(child, "reg", &inputs[0]);
+                       if (ret)
+                               return ret;

                        chanspec.differential = 0; inputs[1] = MCP3564_AGND; }
-               if (ret) {
-                       fwnode_handle_put(child); -                       return ret;
-               }

                if (inputs[0] > MCP3564_INTERNAL_VCM ||
-                   inputs[1] > MCP3564_INTERNAL_VCM) {
-                       fwnode_handle_put(child);
+                   inputs[1] > MCP3564_INTERNAL_VCM) return dev_err_probe(&indio_dev->dev, - EINVAL,
                                             "Channel index > %d, for %s\n",
                                             MCP3564_INTERNAL_VCM + 1,
                                             node_name);
-               }

Quoted 5 lines

                chanspec.address = (inputs[0] << 4) | inputs[1]; chanspec.channel = inputs[0];
--
2.44.0

The changes looks OK,

Thanks,
Marius

author maintainer
#6 lore raw

PATCH v6 2/2 iio: adc: ti-ads1015: Use device_for_each_child_node_scoped()

In reply to Jonathan Cameron

From: Jonathan Cameron <[email protected]>

Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths.

---
 drivers/iio/adc/ti-ads1015.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/iio/adc/ti-ads1015.c +1 -4
index 6ae967e4d8fa..d3363d02f292 100644
@@ -902,10 +902,9 @@ static int ads1015_client_get_channels_config(struct i2c_client *client)
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 	struct ads1015_data *data = iio_priv(indio_dev);
 	struct device *dev = &client->dev;
-	struct fwnode_handle *node;
 	int i = -1;
 
-	device_for_each_child_node(dev, node) {
+	device_for_each_child_node_scoped(dev, node) {
 		u32 pval;
 		unsigned int channel;
 		unsigned int pga = ADS1015_DEFAULT_PGA;
@@ -927,7 +926,6 @@ static int ads1015_client_get_channels_config(struct i2c_client *client)
 			pga = pval;
 			if (pga > 5) {
 				dev_err(dev, "invalid gain on %pfw\n", node);
-				fwnode_handle_put(node);
 				return -EINVAL;
 			}
 		}
@@ -936,7 +934,6 @@ static int ads1015_client_get_channels_config(struct i2c_client *client)
 			data_rate = pval;
 			if (data_rate > 7) {
 				dev_err(dev, "invalid data_rate on %pfw\n", node);
-				fwnode_handle_put(node);
 				return -EINVAL;
 			}
 		}
Signature · 1 line
2.44.0