From: Nithishvelan M <mnithishvelan@gmail.com>
To: Jonathan Cameron <jic23@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Nuno Sa <nuno.sa@analog.com>,
Michael Hennerich <Michael.Hennerich@analog.com>,
David Lechner <dlechner@baylibre.com>,
Andy Shevchenko <andy@kernel.org>,
linux-iio@vger.kernel.org, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org,
Nithishvelan M <mnithishvelan@gmail.com>
Subject: [PATCH v2] staging: iio: impedance-analyzer: ad5933: use guard(mutex) in ad5933_show()
Date: Mon, 19 Oct 2026 15:02:48 +0000 [thread overview]
Message-ID: <20261019150248.416-1-mnithishvelan@gmail.com> (raw)
Use guard(mutex) to automatically manage the state lock in
ad5933_show(). This simplifies the function by allowing direct returns
from each switch case, eliminating the mutable return variables and
manual mutex_unlock() calls.
Signed-off-by: Nithishvelan M <mnithishvelan@gmail.com>
---
Changes in v2:
- Extract range index into local variable 'ridx' to prevent static
analysis warnings (Andy Shevchenko)
- Keep short return sysfs_emit() call on a single line (Andy Shevchenko)
- Split AD5933_OUT_RANGE_AVAIL arguments logically across lines (Andy Shevchenko)
- Remove redundant parentheses in AD5933_IN_PGA_GAIN ternary (Andy Shevchenko)
.../staging/iio/impedance-analyzer/ad5933.c | 38 ++++++++-----------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 798e62bae2..7c3af47e0c 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -6,6 +6,7 @@
*/
#include <linux/bits.h>
+#include <linux/cleanup.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/device.h>
@@ -333,39 +334,30 @@ static ssize_t ad5933_show(struct device *dev,
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad5933_state *st = iio_priv(indio_dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- int ret = 0, len = 0;
+ unsigned int ridx;
+
+ guard(mutex)(&st->lock);
- mutex_lock(&st->lock);
switch ((u32)this_attr->address) {
case AD5933_OUT_RANGE:
- len = sysfs_emit(buf, "%u\n",
- st->range_avail[(st->ctrl_hb >> 1) & 0x3]);
- break;
+ ridx = (st->ctrl_hb >> 1) & 0x03;
+ return sysfs_emit(buf, "%u\n", st->range_avail[ridx]);
case AD5933_OUT_RANGE_AVAIL:
- len = sysfs_emit(buf, "%u %u %u %u\n", st->range_avail[0],
- st->range_avail[3], st->range_avail[2],
- st->range_avail[1]);
- break;
+ return sysfs_emit(buf, "%u %u %u %u\n",
+ st->range_avail[0], st->range_avail[3],
+ st->range_avail[2], st->range_avail[1]);
case AD5933_OUT_SETTLING_CYCLES:
- len = sysfs_emit(buf, "%d\n", st->settling_cycles);
- break;
+ return sysfs_emit(buf, "%d\n", st->settling_cycles);
case AD5933_IN_PGA_GAIN:
- len = sysfs_emit(buf, "%s\n",
- (st->ctrl_hb & AD5933_CTRL_PGA_GAIN_1) ?
- "1" : "0.2");
- break;
+ return sysfs_emit(buf, "%s\n",
+ st->ctrl_hb & AD5933_CTRL_PGA_GAIN_1 ? "1" : "0.2");
case AD5933_IN_PGA_GAIN_AVAIL:
- len = sysfs_emit(buf, "1 0.2\n");
- break;
+ return sysfs_emit(buf, "1 0.2\n");
case AD5933_FREQ_POINTS:
- len = sysfs_emit(buf, "%d\n", st->freq_points);
- break;
+ return sysfs_emit(buf, "%d\n", st->freq_points);
default:
- ret = -EINVAL;
+ return -EINVAL;
}
-
- mutex_unlock(&st->lock);
- return ret ? ret : len;
}
static ssize_t ad5933_store(struct device *dev,
--
2.53.0
next reply other threads:[~2026-10-19 15:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 15:02 Nithishvelan M [this message]
2026-10-19 19:09 ` [PATCH v2] staging: iio: impedance-analyzer: ad5933: use guard(mutex) in ad5933_show() Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2026-10-19 5:07 Nithishvelan M
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=20261019150248.416-1-mnithishvelan@gmail.com \
--to=mnithishvelan@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=nuno.sa@analog.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.