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 v2 14/14] iio: dac: ltc2688: Use device_for_each_child_node_scoped()
Date: Sun, 11 Feb 2024 19:25:40 +0000 [thread overview]
Message-ID: <20240211192540.340682-15-jic23@kernel.org> (raw)
In-Reply-To: <20240211192540.340682-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: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/dac/ltc2688.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/iio/dac/ltc2688.c b/drivers/iio/dac/ltc2688.c
index fc8eb53c65be..b71df03fc13b 100644
--- a/drivers/iio/dac/ltc2688.c
+++ b/drivers/iio/dac/ltc2688.c
@@ -746,26 +746,21 @@ static int ltc2688_span_lookup(const struct ltc2688_state *st, int min, int max)
static int ltc2688_channel_config(struct ltc2688_state *st)
{
struct device *dev = &st->spi->dev;
- struct fwnode_handle *child;
u32 reg, clk_input, val, tmp[2];
int ret, span;
- device_for_each_child_node(dev, child) {
+ device_for_each_child_node_scoped(dev, child) {
struct ltc2688_chan *chan;
ret = fwnode_property_read_u32(child, "reg", ®);
- if (ret) {
- fwnode_handle_put(child);
+ if (ret)
return dev_err_probe(dev, ret,
"Failed to get reg property\n");
- }
- if (reg >= LTC2688_DAC_CHANNELS) {
- fwnode_handle_put(child);
+ if (reg >= LTC2688_DAC_CHANNELS)
return dev_err_probe(dev, -EINVAL,
"reg bigger than: %d\n",
LTC2688_DAC_CHANNELS);
- }
val = 0;
chan = &st->channels[reg];
@@ -786,12 +781,10 @@ static int ltc2688_channel_config(struct ltc2688_state *st)
if (!ret) {
span = ltc2688_span_lookup(st, (int)tmp[0] / 1000,
tmp[1] / 1000);
- if (span < 0) {
- fwnode_handle_put(child);
+ if (span < 0)
return dev_err_probe(dev, -EINVAL,
"output range not valid:[%d %d]\n",
tmp[0], tmp[1]);
- }
val |= FIELD_PREP(LTC2688_CH_SPAN_MSK, span);
}
@@ -800,17 +793,14 @@ static int ltc2688_channel_config(struct ltc2688_state *st)
&clk_input);
if (!ret) {
if (clk_input >= LTC2688_CH_TGP_MAX) {
- fwnode_handle_put(child);
return dev_err_probe(dev, -EINVAL,
"toggle-dither-input inv value(%d)\n",
clk_input);
}
ret = ltc2688_tgp_clk_setup(st, chan, child, clk_input);
- if (ret) {
- fwnode_handle_put(child);
+ if (ret)
return ret;
- }
/*
* 0 means software toggle which is the default mode.
@@ -844,11 +834,9 @@ static int ltc2688_channel_config(struct ltc2688_state *st)
ret = regmap_write(st->regmap, LTC2688_CMD_CH_SETTING(reg),
val);
- if (ret) {
- fwnode_handle_put(child);
+ if (ret)
return dev_err_probe(dev, -EINVAL,
"failed to set chan settings\n");
- }
}
return 0;
--
2.43.1
prev parent reply other threads:[~2024-02-11 19:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-11 19:25 [PATCH v2 00/14] device property / IIO: Use cleanup.h magic for fwnode_handle_put() handling Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 01/14] device property: Add cleanup.h based fwnode_handle_put() scope based cleanup Jonathan Cameron
2024-02-12 8:49 ` Sakari Ailus
2024-02-12 11:42 ` Jonathan Cameron
2024-02-12 12:36 ` Sakari Ailus
2024-02-12 12:46 ` Andy Shevchenko
2024-02-12 12:58 ` Sakari Ailus
2024-02-13 10:22 ` Jonathan Cameron
2024-02-14 14:09 ` Jonathan Cameron
2024-02-14 17:10 ` Sakari Ailus
2024-02-12 12:05 ` Andy Shevchenko
2024-02-12 12:06 ` Andy Shevchenko
2024-02-11 19:25 ` [PATCH v2 02/14] iio: temp: ltc2983: Use __free(fwnode_handle) to replace fwnode_handle_put() calls Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 03/14] device property: Introduce device_for_each_child_node_scoped() Jonathan Cameron
2024-02-12 12:10 ` Andy Shevchenko
2024-02-13 10:25 ` Jonathan Cameron
2024-02-13 17:12 ` Andy Shevchenko
2024-02-16 17:38 ` Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 04/14] iio: adc: max11410: Use device_for_each_child_node_scoped() Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 05/14] iio: adc: mcp3564: Use device_for_each_child_node_scopd() Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 06/14] iio: adc: qcom-spmi-adc5: " Jonathan Cameron
2024-02-12 7:51 ` Dmitry Baryshkov
2024-02-11 19:25 ` [PATCH v2 07/14] iio: adc: rzg2l_adc: " Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 08/14] iio: adc: stm32: Use device_for_each_child_node_scoped() Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 09/14] iio: adc: ti-ads1015: " Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 10/14] iio: adc: ti-ads131e08: " Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 11/14] iio: addac: ad74413r: " Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 12/14] iio: dac: ad3552r: " Jonathan Cameron
2024-02-11 19:25 ` [PATCH v2 13/14] iio: dac: ad5770r: " Jonathan Cameron
2024-02-11 19:25 ` Jonathan Cameron [this message]
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=20240211192540.340682-15-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