From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
Rob Herring <robh@kernel.org>,
Frank Rowand <frowand.list@gmail.com>
Cc: Julia Lawall <Julia.Lawall@inria.fr>,
Nicolas Palix <nicolas.palix@imag.fr>,
Sumera Priyadarsini <sylphrenadin@gmail.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH 3/4] iio: adc: fsl-imx25-gcq: Use __free(device_node)
Date: Sun, 14 Jan 2024 16:53:57 +0000 [thread overview]
Message-ID: <20240114165358.119916-4-jic23@kernel.org> (raw)
In-Reply-To: <20240114165358.119916-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Using automated cleanup reduces chance of an reference count leak
and simplfies the code.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/fsl-imx25-gcq.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c
index 68c813de0605..e04f92d7a953 100644
--- a/drivers/iio/adc/fsl-imx25-gcq.c
+++ b/drivers/iio/adc/fsl-imx25-gcq.c
@@ -199,7 +199,7 @@ static int mx25_gcq_setup_cfgs(struct platform_device *pdev,
struct mx25_gcq_priv *priv)
{
struct device_node *np = pdev->dev.of_node;
- struct device_node *child;
+ struct device_node *child __free(device_node) = NULL;
struct device *dev = &pdev->dev;
int ret, i;
@@ -224,14 +224,12 @@ static int mx25_gcq_setup_cfgs(struct platform_device *pdev,
ret = of_property_read_u32(child, "reg", ®);
if (ret) {
dev_err(dev, "Failed to get reg property\n");
- of_node_put(child);
return ret;
}
if (reg >= MX25_NUM_CFGS) {
dev_err(dev,
"reg value is greater than the number of available configuration registers\n");
- of_node_put(child);
return -EINVAL;
}
@@ -243,10 +241,9 @@ static int mx25_gcq_setup_cfgs(struct platform_device *pdev,
case MX25_ADC_REFP_XP:
case MX25_ADC_REFP_YP:
ret = mx25_gcq_ext_regulator_setup(&pdev->dev, priv, refp);
- if (ret) {
- of_node_put(child);
+ if (ret)
return ret;
- }
+
priv->channel_vref_mv[reg] =
regulator_get_voltage(priv->vref[refp]);
/* Conversion from uV to mV */
@@ -257,7 +254,6 @@ static int mx25_gcq_setup_cfgs(struct platform_device *pdev,
break;
default:
dev_err(dev, "Invalid positive reference %d\n", refp);
- of_node_put(child);
return -EINVAL;
}
@@ -270,12 +266,10 @@ static int mx25_gcq_setup_cfgs(struct platform_device *pdev,
if ((refp & MX25_ADCQ_CFG_REFP_MASK) != refp) {
dev_err(dev, "Invalid fsl,adc-refp property value\n");
- of_node_put(child);
return -EINVAL;
}
if ((refn & MX25_ADCQ_CFG_REFN_MASK) != refn) {
dev_err(dev, "Invalid fsl,adc-refn property value\n");
- of_node_put(child);
return -EINVAL;
}
--
2.43.0
next prev parent reply other threads:[~2024-01-14 16:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-14 16:53 [PATCH 0/4] of: Automate handling of of_node_put() Jonathan Cameron
2024-01-14 16:53 ` [PATCH 1/4] of: Add cleanup.h based auto release via __free(device_node) markings Jonathan Cameron
2024-01-14 16:53 ` [PATCH 2/4] of: unittest: Use __free(device_node) Jonathan Cameron
2024-01-16 18:26 ` Rob Herring
2024-01-17 17:01 ` Jonathan Cameron
2024-01-17 17:09 ` Jonathan Cameron
2024-01-17 19:47 ` Rob Herring
2024-01-17 20:13 ` Jonathan Cameron
2024-01-14 16:53 ` Jonathan Cameron [this message]
2024-01-14 16:53 ` [PATCH 4/4] iio: adc: rcar-gyroadc: use __free(device_node) 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=20240114165358.119916-4-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Julia.Lawall@inria.fr \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-iio@vger.kernel.org \
--cc=nicolas.palix@imag.fr \
--cc=robh@kernel.org \
--cc=sylphrenadin@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.