From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org,
"Rafael J . Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Daniel Scally <djrscally@gmail.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Julia Lawall <Julia.Lawall@inria.fr>
Cc: "Nuno Sá" <nuno.sa@analog.com>,
"Cosmin Tanislav" <cosmin.tanislav@analog.com>,
"Mihail Chindris" <mihail.chindris@analog.com>,
"Rasmus Villemoes" <linux@rasmusvillemoes.dk>,
"Tomislav Denis" <tomislav.denis@avl.com>,
"Marek Vasut" <marex@denx.de>,
"Olivier Moysan" <olivier.moysan@foss.st.com>,
"Fabrice Gasnier" <fabrice.gasnier@foss.st.com>,
"Lad Prabhakar" <prabhakar.mahadev-lad.rj@bp.renesas.com>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Marijn Suijten" <marijn.suijten@somainline.org>,
"Marius Cristea" <marius.cristea@microchip.com>,
"Ibrahim Tilki" <Ibrahim.Tilki@analog.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>
Subject: [PATCH v4 11/15] iio: adc: ti-ads131e08: Use device_for_each_child_node_scoped()
Date: Sat, 17 Feb 2024 16:42:45 +0000 [thread overview]
Message-ID: <20240217164249.921878-12-jic23@kernel.org> (raw)
In-Reply-To: <20240217164249.921878-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
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.
Cc: Tomislav Denis <tomislav.denis@avl.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/ti-ads131e08.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
index fcfc46254313..f653654f7c5d 100644
--- a/drivers/iio/adc/ti-ads131e08.c
+++ b/drivers/iio/adc/ti-ads131e08.c
@@ -694,7 +694,6 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
struct ads131e08_channel_config *channel_config;
struct device *dev = &st->spi->dev;
struct iio_chan_spec *channels;
- struct fwnode_handle *node;
unsigned int channel, tmp;
int num_channels, i, ret;
@@ -736,10 +735,10 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
return -ENOMEM;
i = 0;
- device_for_each_child_node(dev, node) {
+ device_for_each_child_node_scoped(dev, node) {
ret = fwnode_property_read_u32(node, "reg", &channel);
if (ret)
- goto err_child_out;
+ return ret;
ret = fwnode_property_read_u32(node, "ti,gain", &tmp);
if (ret) {
@@ -747,7 +746,7 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
} else {
ret = ads131e08_pga_gain_to_field_value(st, tmp);
if (ret < 0)
- goto err_child_out;
+ return ret;
channel_config[i].pga_gain = tmp;
}
@@ -758,7 +757,7 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
} else {
ret = ads131e08_validate_channel_mux(st, tmp);
if (ret)
- goto err_child_out;
+ return ret;
channel_config[i].mux = tmp;
}
@@ -784,10 +783,6 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
st->channel_config = channel_config;
return 0;
-
-err_child_out:
- fwnode_handle_put(node);
- return ret;
}
static void ads131e08_regulator_disable(void *data)
--
2.43.2
next prev parent reply other threads:[~2024-02-17 16:44 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-17 16:42 [PATCH v4 00/15] device property / IIO: Use cleanup.h magic for fwnode_handle_put() handling Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 01/15] device property: Move fwnode_handle_put() into property.h Jonathan Cameron
2024-02-19 8:55 ` Greg Kroah-Hartman
2024-02-20 6:55 ` Sakari Ailus
2024-02-17 16:42 ` [PATCH v4 02/15] device property: Add cleanup.h based fwnode_handle_put() scope based cleanup Jonathan Cameron
2024-02-19 8:55 ` Greg Kroah-Hartman
2024-02-20 6:55 ` Sakari Ailus
2024-02-17 16:42 ` [PATCH v4 03/15] iio: temp: ltc2983: Use __free(fwnode_handle) to replace fwnode_handle_put() calls Jonathan Cameron
2024-02-19 13:52 ` Nuno Sá
2024-02-24 11:37 ` Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 04/15] device property: Introduce device_for_each_child_node_scoped() Jonathan Cameron
2024-02-19 8:56 ` Greg Kroah-Hartman
2024-02-20 6:59 ` Sakari Ailus
2024-02-17 16:42 ` [PATCH v4 05/15] iio: adc: max11410: Use device_for_each_child_node_scoped() Jonathan Cameron
2024-02-19 13:54 ` Nuno Sá
2024-02-17 16:42 ` [PATCH v4 06/15] iio: adc: mcp3564: " Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 07/15] iio: adc: qcom-spmi-adc5: " Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 08/15] iio: adc: rzg2l_adc: " Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 09/15] iio: adc: stm32: " Jonathan Cameron
2024-02-19 11:45 ` Andy Shevchenko
2024-02-24 12:16 ` Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 10/15] iio: adc: ti-ads1015: " Jonathan Cameron
2024-02-17 16:42 ` Jonathan Cameron [this message]
2024-02-17 16:42 ` [PATCH v4 12/15] iio: addac: ad74413r: " Jonathan Cameron
2024-02-19 13:55 ` Nuno Sá
2024-02-17 16:42 ` [PATCH v4 13/15] iio: dac: ad3552r: " Jonathan Cameron
2024-02-19 11:46 ` Andy Shevchenko
2024-02-17 16:42 ` [PATCH v4 14/15] iio: dac: ad5770r: " Jonathan Cameron
2024-02-17 16:42 ` [PATCH v4 15/15] iio: dac: ltc2688: " Jonathan Cameron
2024-02-19 11:48 ` Andy Shevchenko
2024-02-19 15:48 ` Jonathan Cameron
2024-02-19 13:49 ` Nuno Sá
2024-02-19 11:49 ` [PATCH v4 00/15] device property / IIO: Use cleanup.h magic for fwnode_handle_put() handling Andy Shevchenko
2024-02-19 15:49 ` Jonathan Cameron
2024-02-24 11:49 ` Jonathan Cameron
2024-02-28 14:15 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240217164249.921878-12-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Ibrahim.Tilki@analog.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=Julia.Lawall@inria.fr \
--cc=andriy.shevchenko@linux.intel.com \
--cc=cosmin.tanislav@analog.com \
--cc=djrscally@gmail.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=fabrice.gasnier@foss.st.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=marex@denx.de \
--cc=marijn.suijten@somainline.org \
--cc=marius.cristea@microchip.com \
--cc=mihail.chindris@analog.com \
--cc=nuno.sa@analog.com \
--cc=olivier.moysan@foss.st.com \
--cc=peterz@infradead.org \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tomislav.denis@avl.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).