From: Ethan Tidmore <ethantidmore06@gmail.com>
To: Antoniu Miclaus <antoniu.miclaus@analog.com>,
Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Michael Hennerich <Michael.Hennerich@analog.com>
Cc: "David Lechner" <dlechner@baylibre.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Andy Shevchenko" <andy@kernel.org>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
"Ethan Tidmore" <ethantidmore06@gmail.com>
Subject: [PATCH 2/3] iio: filter: admv8818: Simplify locking with guard()
Date: Fri, 27 Feb 2026 00:14:23 -0600 [thread overview]
Message-ID: <20260227061424.1135505-3-ethantidmore06@gmail.com> (raw)
In-Reply-To: <20260227061424.1135505-1-ethantidmore06@gmail.com>
Use guard() instead of manual locking to simplify code.
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
---
drivers/iio/filter/admv8818.c | 59 ++++++++++++-----------------------
1 file changed, 20 insertions(+), 39 deletions(-)
diff --git a/drivers/iio/filter/admv8818.c b/drivers/iio/filter/admv8818.c
index 4d5e7a9d806a..2d12700d717f 100644
--- a/drivers/iio/filter/admv8818.c
+++ b/drivers/iio/filter/admv8818.c
@@ -7,6 +7,7 @@
#include <linux/bitfield.h>
#include <linux/bits.h>
+#include <linux/cleanup.h>
#include <linux/clk.h>
#include <linux/device.h>
#include <linux/iio/iio.h>
@@ -205,13 +206,8 @@ static int __admv8818_hpf_select(struct admv8818_state *st, u64 freq)
static int admv8818_hpf_select(struct admv8818_state *st, u64 freq)
{
- int ret;
-
- mutex_lock(&st->lock);
- ret = __admv8818_hpf_select(st, freq);
- mutex_unlock(&st->lock);
-
- return ret;
+ guard(mutex)(&st->lock);
+ return __admv8818_hpf_select(st, freq);
}
static int __admv8818_lpf_select(struct admv8818_state *st, u64 freq)
@@ -281,13 +277,8 @@ static int __admv8818_lpf_select(struct admv8818_state *st, u64 freq)
static int admv8818_lpf_select(struct admv8818_state *st, u64 freq)
{
- int ret;
-
- mutex_lock(&st->lock);
- ret = __admv8818_lpf_select(st, freq);
- mutex_unlock(&st->lock);
-
- return ret;
+ guard(mutex)(&st->lock);
+ return __admv8818_lpf_select(st, freq);
}
static int admv8818_rfin_band_select(struct admv8818_state *st)
@@ -308,16 +299,17 @@ static int admv8818_rfin_band_select(struct admv8818_state *st)
if (lpf_corner_target < st->cf_hz)
lpf_corner_target = U64_MAX;
- mutex_lock(&st->lock);
+ guard(mutex)(&st->lock);
ret = __admv8818_hpf_select(st, hpf_corner_target);
if (ret)
- goto exit;
+ return ret;
ret = __admv8818_lpf_select(st, lpf_corner_target);
-exit:
- mutex_unlock(&st->lock);
- return ret;
+ if (ret)
+ return ret;
+
+ return 0;
}
static int __admv8818_read_hpf_freq(struct admv8818_state *st, u64 *hpf_freq)
@@ -352,13 +344,8 @@ static int __admv8818_read_hpf_freq(struct admv8818_state *st, u64 *hpf_freq)
static int admv8818_read_hpf_freq(struct admv8818_state *st, u64 *hpf_freq)
{
- int ret;
-
- mutex_lock(&st->lock);
- ret = __admv8818_read_hpf_freq(st, hpf_freq);
- mutex_unlock(&st->lock);
-
- return ret;
+ guard(mutex)(&st->lock);
+ return __admv8818_read_hpf_freq(st, hpf_freq);
}
static int __admv8818_read_lpf_freq(struct admv8818_state *st, u64 *lpf_freq)
@@ -393,13 +380,8 @@ static int __admv8818_read_lpf_freq(struct admv8818_state *st, u64 *lpf_freq)
static int admv8818_read_lpf_freq(struct admv8818_state *st, u64 *lpf_freq)
{
- int ret;
-
- mutex_lock(&st->lock);
- ret = __admv8818_read_lpf_freq(st, lpf_freq);
- mutex_unlock(&st->lock);
-
- return ret;
+ guard(mutex)(&st->lock);
+ return __admv8818_read_lpf_freq(st, lpf_freq);
}
static int admv8818_write_raw_get_fmt(struct iio_dev *indio_dev,
@@ -485,7 +467,7 @@ static int admv8818_filter_bypass(struct admv8818_state *st)
{
int ret;
- mutex_lock(&st->lock);
+ guard(mutex)(&st->lock);
ret = regmap_update_bits(st->regmap, ADMV8818_REG_WR0_SW,
ADMV8818_SW_IN_SET_WR0_MSK |
@@ -497,18 +479,17 @@ static int admv8818_filter_bypass(struct admv8818_state *st)
FIELD_PREP(ADMV8818_SW_OUT_SET_WR0_MSK, 1) |
FIELD_PREP(ADMV8818_SW_OUT_WR0_MSK, 0));
if (ret)
- goto exit;
+ return ret;
ret = regmap_update_bits(st->regmap, ADMV8818_REG_WR0_FILTER,
ADMV8818_HPF_WR0_MSK |
ADMV8818_LPF_WR0_MSK,
FIELD_PREP(ADMV8818_HPF_WR0_MSK, 0) |
FIELD_PREP(ADMV8818_LPF_WR0_MSK, 0));
+ if (ret)
+ return ret;
-exit:
- mutex_unlock(&st->lock);
-
- return ret;
+ return 0;
}
static int admv8818_get_mode(struct iio_dev *indio_dev,
--
2.53.0
next prev parent reply other threads:[~2026-02-27 6:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-27 6:14 [PATCH 0/3] iio: filter: admv8818: Bug fix and other improvements Ethan Tidmore
2026-02-27 6:14 ` [PATCH 1/3] iio: filter: admv8818: Add missing error code Ethan Tidmore
2026-02-27 6:42 ` Ethan Tidmore
2026-02-27 7:06 ` Andy Shevchenko
2026-02-27 16:01 ` David Lechner
2026-02-27 16:06 ` Andy Shevchenko
2026-02-27 7:04 ` Andy Shevchenko
2026-02-27 16:02 ` David Lechner
2026-02-27 6:14 ` Ethan Tidmore [this message]
2026-02-27 7:08 ` [PATCH 2/3] iio: filter: admv8818: Simplify locking with guard() Andy Shevchenko
2026-02-27 16:08 ` David Lechner
2026-03-02 22:34 ` Ethan Tidmore
2026-02-27 6:14 ` [PATCH 3/3] iio: filter: admv8818: Minor cleanups Ethan Tidmore
2026-02-27 7:18 ` 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=20260227061424.1135505-3-ethantidmore06@gmail.com \
--to=ethantidmore06@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=andy@kernel.org \
--cc=antoniu.miclaus@analog.com \
--cc=dlechner@baylibre.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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