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>
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>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>
Subject: [PATCH 02/13] iio: adc: max11410: Use __free(fwnode_handle) to replace fwnode_handle_put() calls
Date: Sun, 14 Jan 2024 17:19:58 +0000 [thread overview]
Message-ID: <20240114172009.179893-3-jic23@kernel.org> (raw)
In-Reply-To: <20240114172009.179893-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This use of the new cleanup.h scope based freeing infrastructure allows
us to exit directly from error conditions within the
device_for_each_child_node(dev, child) loop. On normal exit from that
loop no fwnode_handle reference will be held and the child pointer
will be NULL thus making the automatically run fwnode_handle_put() a
noop whereas it will release the reference held on early breaking or
returning from within the loop.
Cc: Nuno Sá <nuno.sa@analog.com>
Cc: Ibrahim Tilki <Ibrahim.Tilki@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/max11410.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/drivers/iio/adc/max11410.c b/drivers/iio/adc/max11410.c
index 6af829349b4e..790a95474bb9 100644
--- a/drivers/iio/adc/max11410.c
+++ b/drivers/iio/adc/max11410.c
@@ -696,7 +696,7 @@ static int max11410_parse_channels(struct max11410_state *st,
struct device *dev = &st->spi_dev->dev;
struct max11410_channel_config *cfg;
struct iio_chan_spec *channels;
- struct fwnode_handle *child;
+ struct fwnode_handle *child __free(fwnode_handle) = NULL;
u32 reference, sig_path;
const char *node_name;
u32 inputs[2], scale;
@@ -735,47 +735,37 @@ static int max11410_parse_channels(struct max11410_state *st,
inputs[1] = 0;
chanspec.differential = 0;
}
- if (ret) {
- fwnode_handle_put(child);
+ if (ret)
return ret;
- }
if (inputs[0] > MAX11410_CHANNEL_INDEX_MAX ||
- inputs[1] > MAX11410_CHANNEL_INDEX_MAX) {
- fwnode_handle_put(child);
+ inputs[1] > MAX11410_CHANNEL_INDEX_MAX)
return dev_err_probe(&indio_dev->dev, -EINVAL,
"Invalid channel index for %s, should be less than %d\n",
node_name,
MAX11410_CHANNEL_INDEX_MAX + 1);
- }
cfg = &st->channels[chan_idx];
reference = MAX11410_REFSEL_AVDD_AGND;
fwnode_property_read_u32(child, "adi,reference", &reference);
- if (reference > MAX11410_REFSEL_MAX) {
- fwnode_handle_put(child);
+ if (reference > MAX11410_REFSEL_MAX)
return dev_err_probe(&indio_dev->dev, -EINVAL,
"Invalid adi,reference value for %s, should be less than %d.\n",
node_name, MAX11410_REFSEL_MAX + 1);
- }
if (!max11410_get_vrefp(st, reference) ||
- (!max11410_get_vrefn(st, reference) && reference <= 2)) {
- fwnode_handle_put(child);
+ (!max11410_get_vrefn(st, reference) && reference <= 2))
return dev_err_probe(&indio_dev->dev, -EINVAL,
"Invalid VREF configuration for %s, either specify corresponding VREF regulators or change adi,reference property.\n",
node_name);
- }
sig_path = MAX11410_PGA_SIG_PATH_BUFFERED;
fwnode_property_read_u32(child, "adi,input-mode", &sig_path);
- if (sig_path > MAX11410_SIG_PATH_MAX) {
- fwnode_handle_put(child);
+ if (sig_path > MAX11410_SIG_PATH_MAX)
return dev_err_probe(&indio_dev->dev, -EINVAL,
"Invalid adi,input-mode value for %s, should be less than %d.\n",
node_name, MAX11410_SIG_PATH_MAX + 1);
- }
fwnode_property_read_u32(child, "settling-time-us",
&cfg->settling_time_us);
@@ -793,10 +783,8 @@ static int max11410_parse_channels(struct max11410_state *st,
cfg->scale_avail = devm_kcalloc(dev, MAX11410_SCALE_AVAIL_SIZE * 2,
sizeof(*cfg->scale_avail),
GFP_KERNEL);
- if (!cfg->scale_avail) {
- fwnode_handle_put(child);
+ if (!cfg->scale_avail)
return -ENOMEM;
- }
scale = max11410_get_scale(st, *cfg);
for (i = 0; i < MAX11410_SCALE_AVAIL_SIZE; i++) {
--
2.43.0
next prev parent reply other threads:[~2024-01-14 17:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-14 17:19 [PATCH 00/13] device property / IIO: Use cleanup.h magic for fwnode_handle_put() handling Jonathan Cameron
2024-01-14 17:19 ` [PATCH 01/13] device property: Add cleanup.h based fwnode_handle_put() scope based cleanup Jonathan Cameron
2024-01-21 12:28 ` Andy Shevchenko
2024-01-21 16:38 ` Jonathan Cameron
2024-01-21 18:06 ` Lukas Wunner
2024-01-21 18:20 ` Lukas Wunner
2024-01-14 17:19 ` Jonathan Cameron [this message]
2024-01-14 17:19 ` [PATCH 03/13] iio: adc: mcp3564: Use __free(fwnode_handle) to replace fwnode_handle_put() calls Jonathan Cameron
2024-01-14 17:20 ` [PATCH 04/13] iio: adc: qcom-spmi-adc5: " Jonathan Cameron
2024-01-14 17:20 ` [PATCH 05/13] iio: adc: rzg2l_adc: " Jonathan Cameron
2024-01-14 17:20 ` [PATCH 06/13] iio: adc: stm32: " Jonathan Cameron
2024-01-14 17:20 ` [PATCH 07/13] iio: adc: ti-ads1015: " Jonathan Cameron
2024-01-14 17:20 ` [PATCH 08/13] iio: adc: ti-ads131e08: " Jonathan Cameron
2024-01-14 17:20 ` [PATCH 09/13] iio: addac: ad74413r: " Jonathan Cameron
2024-01-15 10:17 ` Nuno Sá
2024-02-11 18:53 ` Jonathan Cameron
2024-01-14 17:20 ` [PATCH 10/13] iio: dac: ad3552: " Jonathan Cameron
2024-01-15 10:19 ` Nuno Sá
2024-01-14 17:20 ` [PATCH 11/13] iio: dac: ad5770r: " Jonathan Cameron
2024-01-14 17:20 ` [PATCH 12/13] iio: dac: ltc2688: " Jonathan Cameron
2024-01-15 10:26 ` Nuno Sá
2024-01-14 17:20 ` [PATCH 13/13] iio: temp: ltc2983: " Jonathan Cameron
2024-01-15 10:29 ` Nuno Sá
2024-01-21 12:27 ` [PATCH 00/13] device property / IIO: Use cleanup.h magic for fwnode_handle_put() handling Andy Shevchenko
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=20240114172009.179893-3-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Ibrahim.Tilki@analog.com \
--cc=Jonathan.Cameron@huawei.com \
--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=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).