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] staging: iio: frequency: ad9832: use guard(mutex)
Date: Tue, 10 Nov 2026 16:47:11 +0000 [thread overview]
Message-ID: <20261110164711.552-1-mnithishvelan@gmail.com> (raw)
Use guard(mutex) to automatically manage the state lock in
ad9832_write(). This simplifies error handling by allowing direct
returns from each switch case and error branch, eliminating the
manual mutex_unlock() calls and the goto error label.
Signed-off-by: Nithishvelan M <mnithishvelan@gmail.com>
---
drivers/staging/iio/frequency/ad9832.c | 47 +++++++++++++++++---------
1 file changed, 31 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 35f823f24..227dcd739 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -8,6 +8,7 @@
#include <linux/array_size.h>
#include <linux/bitfield.h>
#include <linux/bitops.h>
+#include <linux/cleanup.h>
#include <linux/clk.h>
#include <linux/dev_printk.h>
#include <linux/err.h>
@@ -188,52 +189,65 @@ static ssize_t ad9832_write(struct device *dev, struct device_attribute *attr,
ret = kstrtoul(buf, 10, &val);
if (ret)
- goto error_ret;
+ return ret;
+
+ guard(mutex)(&st->lock);
- mutex_lock(&st->lock);
switch ((u32)this_attr->address) {
case AD9832_FREQ0HM:
case AD9832_FREQ1HM:
ret = ad9832_write_frequency(st, this_attr->address, val);
+ if (ret)
+ return ret;
+
break;
case AD9832_PHASE0H:
case AD9832_PHASE1H:
case AD9832_PHASE2H:
case AD9832_PHASE3H:
ret = ad9832_write_phase(st, this_attr->address, val);
+ if (ret)
+ return ret;
+
break;
case AD9832_PINCTRL_EN:
st->ctrl_ss &= ~AD9832_SELSRC;
st->ctrl_ss |= FIELD_PREP(AD9832_SELSRC, val ? 0 : 1);
st->data = cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_SYNCSELSRC) |
- st->ctrl_ss);
+ st->ctrl_ss);
ret = spi_sync(st->spi, &st->msg);
+ if (ret)
+ return ret;
+
break;
case AD9832_FREQ_SYM:
if (val == 1 || val == 0) {
st->ctrl_fp &= ~AD9832_FREQ;
st->ctrl_fp |= FIELD_PREP(AD9832_FREQ, val ? 1 : 0);
} else {
- ret = -EINVAL;
- break;
+ return -EINVAL;
}
st->data = cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_FPSELECT) |
- st->ctrl_fp);
+ st->ctrl_fp);
ret = spi_sync(st->spi, &st->msg);
+ if (ret)
+ return ret;
+
break;
case AD9832_PHASE_SYM:
- if (val > 3) {
- ret = -EINVAL;
- break;
- }
+ if (val > 3)
+ return -EINVAL;
st->ctrl_fp &= ~AD9832_PHASE_MASK;
st->ctrl_fp |= FIELD_PREP(AD9832_PHASE_MASK, val);
st->data = cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_FPSELECT) |
- st->ctrl_fp);
+ st->ctrl_fp);
ret = spi_sync(st->spi, &st->msg);
+ if (ret)
+ return ret;
+
break;
case AD9832_OUTPUT_EN:
if (val)
@@ -242,16 +256,17 @@ static ssize_t ad9832_write(struct device *dev, struct device_attribute *attr,
st->ctrl_src |= FIELD_PREP(AD9832_RESET, 1);
st->data = cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_SLEEPRESCLR) |
- st->ctrl_src);
+ st->ctrl_src);
ret = spi_sync(st->spi, &st->msg);
+ if (ret)
+ return ret;
+
break;
default:
- ret = -ENODEV;
+ return -ENODEV;
}
- mutex_unlock(&st->lock);
-error_ret:
- return ret ? ret : len;
+ return len;
}
/*
--
2.53.0
next reply other threads:[~2026-11-10 16:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-10 16:47 Nithishvelan M [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-10-18 10:26 Melih Emik
2026-10-18 15:55 ` Joshua Crofts
2026-10-19 8:59 ` Melih Emik
2026-10-19 9:23 ` 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=20261110164711.552-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®