From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org, Rob Herring <robh@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
linux-kernel@vger.kernel.org,
Julia Lawall <Julia.Lawall@inria.fr>
Cc: "Peter Zijlstra" <peterz@infradead.org>,
"Nicolas Palix" <nicolas.palix@imag.fr>,
"Sumera Priyadarsini" <sylphrenadin@gmail.com>,
"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>,
"Nuno Sá" <nuno.sa@analog.com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>
Subject: [PATCH 8/8] iio: adc: adi-axi-adc: Use __free(device_node) and guard(mutex)
Date: Sun, 11 Feb 2024 17:42:36 +0000 [thread overview]
Message-ID: <20240211174237.182947-9-jic23@kernel.org> (raw)
In-Reply-To: <20240211174237.182947-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Avoid need to manually handle of_node_put() or the unlocking of the
mutex.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/adi-axi-adc.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/adc/adi-axi-adc.c b/drivers/iio/adc/adi-axi-adc.c
index c247ff1541d2..3c85e8a6467b 100644
--- a/drivers/iio/adc/adi-axi-adc.c
+++ b/drivers/iio/adc/adi-axi-adc.c
@@ -248,19 +248,19 @@ static struct adi_axi_adc_client *adi_axi_adc_attach_client(struct device *dev)
{
const struct adi_axi_adc_core_info *info;
struct adi_axi_adc_client *cl;
- struct device_node *cln;
info = of_device_get_match_data(dev);
if (!info)
return ERR_PTR(-ENODEV);
- cln = of_parse_phandle(dev->of_node, "adi,adc-dev", 0);
+ struct device_node *cln __free(device_node) =
+ of_parse_phandle(dev->of_node, "adi,adc-dev", 0);
if (!cln) {
dev_err(dev, "No 'adi,adc-dev' node defined\n");
return ERR_PTR(-ENODEV);
}
- mutex_lock(®istered_clients_lock);
+ guard(mutex)(®istered_clients_lock);
list_for_each_entry(cl, ®istered_clients, entry) {
if (!cl->dev)
@@ -269,22 +269,14 @@ static struct adi_axi_adc_client *adi_axi_adc_attach_client(struct device *dev)
if (cl->dev->of_node != cln)
continue;
- if (!try_module_get(cl->dev->driver->owner)) {
- mutex_unlock(®istered_clients_lock);
- of_node_put(cln);
+ if (!try_module_get(cl->dev->driver->owner))
return ERR_PTR(-ENODEV);
- }
get_device(cl->dev);
cl->info = info;
- mutex_unlock(®istered_clients_lock);
- of_node_put(cln);
return cl;
}
- mutex_unlock(®istered_clients_lock);
- of_node_put(cln);
-
return ERR_PTR(-EPROBE_DEFER);
}
--
2.43.1
next prev parent reply other threads:[~2024-02-11 17:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-11 17:42 [PATCH 0/8] of: automate of_node_put() - new approach to loops Jonathan Cameron
2024-02-11 17:42 ` [PATCH 1/8] of: Add cleanup.h based auto release via __free(device_node) markings Jonathan Cameron
2024-02-11 17:42 ` [PATCH 2/8] of: Introduce for_each_*_child_of_node_scoped() to automate of_node_put() handling Jonathan Cameron
2024-02-12 8:20 ` Julia Lawall
2024-02-12 11:37 ` Jonathan Cameron
2024-02-11 17:42 ` [PATCH 3/8] of: unittest: Use for_each_child_of_node_scoped() Jonathan Cameron
2024-02-11 17:42 ` [PATCH 4/8] iio: adc: fsl-imx25-gcq: Use for_each_available_child_node_scoped() Jonathan Cameron
2024-02-11 17:42 ` [PATCH 5/8] iio: adc: rcar-gyroadc: use for_each_available_child_node_scoped() Jonathan Cameron
2024-02-11 17:42 ` [PATCH 6/8] iio: adc: ad7124: Use for_each_available_child_of_node_scoped() Jonathan Cameron
2024-02-11 17:42 ` [PATCH 7/8] iio: adc: ad7292: " Jonathan Cameron
2024-02-11 17:42 ` Jonathan Cameron [this message]
2024-02-12 12:03 ` [PATCH 0/8] of: automate of_node_put() - new approach to loops Andy Shevchenko
2024-02-16 14:47 ` Jonathan Cameron
2024-02-16 15:25 ` Andy Shevchenko
2024-02-23 9:13 ` 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=20240211174237.182947-9-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Julia.Lawall@inria.fr \
--cc=andriy.shevchenko@linux.intel.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.palix@imag.fr \
--cc=nuno.sa@analog.com \
--cc=peterz@infradead.org \
--cc=rafael@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox