From: Maxwell Doose <m32285159@gmail.com>
To: songqiang1304521@gmail.com, jic23@kernel.org
Cc: dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/4] iio: magnetometer: rm3100: Use scoped_guard() in rm3100_get_samp_freq()
Date: Tue, 28 Apr 2026 07:46:42 -0500 [thread overview]
Message-ID: <20260428124644.49707-3-m32285159@gmail.com> (raw)
In-Reply-To: <20260428124644.49707-1-m32285159@gmail.com>
Replace mutex_lock() and mutex_unlock() calls in rm3100_get_samp_freq()
with the more modern scoped_guard(). This will help modernize the
driver and bring it up-to-date with modern available macros/functions.
Signed-off-by: Maxwell Doose <m32285159@gmail.com>
---
v2:
- Move if statement into scoped_guard body per Andy.
drivers/iio/magnetometer/rm3100-core.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetometer/rm3100-core.c
index 426963935d60..9f25efb2d02d 100644
--- a/drivers/iio/magnetometer/rm3100-core.c
+++ b/drivers/iio/magnetometer/rm3100-core.c
@@ -280,11 +280,12 @@ static int rm3100_get_samp_freq(struct rm3100_data *data, int *val, int *val2)
unsigned int tmp;
int ret;
- mutex_lock(&data->lock);
- ret = regmap_read(data->regmap, RM3100_REG_TMRC, &tmp);
- mutex_unlock(&data->lock);
- if (ret < 0)
- return ret;
+ scoped_guard(mutex, &data->lock) {
+ ret = regmap_read(data->regmap, RM3100_REG_TMRC, &tmp);
+
+ if (ret < 0)
+ return ret;
+ }
*val = rm3100_samp_rates[tmp - RM3100_TMRC_OFFSET][0];
*val2 = rm3100_samp_rates[tmp - RM3100_TMRC_OFFSET][1];
--
2.53.0
next prev parent reply other threads:[~2026-04-28 12:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-28 12:46 [PATCH 0/4] iio: magnetometer: rm3100: Modernize locking and control flow Maxwell Doose
2026-04-28 12:46 ` [PATCH v2 1/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_read_mag() Maxwell Doose
2026-04-28 13:26 ` Andy Shevchenko
2026-04-28 14:59 ` Maxwell Doose
2026-04-28 15:58 ` Jonathan Cameron
2026-04-28 12:46 ` Maxwell Doose [this message]
2026-04-28 13:26 ` [PATCH v2 2/4] iio: magnetometer: rm3100: Use scoped_guard() in rm3100_get_samp_freq() Andy Shevchenko
2026-04-28 13:59 ` Maxwell Doose
2026-04-28 15:24 ` Jonathan Cameron
2026-04-28 17:08 ` Maxwell Doose
2026-04-28 12:46 ` [PATCH v2 3/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_set_samp_freq() Maxwell Doose
2026-04-28 12:46 ` [PATCH v2 4/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_trigger_handler() Maxwell Doose
2026-04-28 15:32 ` Jonathan Cameron
2026-04-28 17:20 ` Maxwell Doose
2026-04-28 17:27 ` Maxwell Doose
2026-04-28 17:39 ` Jonathan Cameron
2026-04-28 19:09 ` Maxwell Doose
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=20260428124644.49707-3-m32285159@gmail.com \
--to=m32285159@gmail.com \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nuno.sa@analog.com \
--cc=songqiang1304521@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