From: Neel Bullywon <neelb2403@gmail.com>
To: Jonathan Cameron <jic23@kernel.org>
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,
"Neel Bullywon" <neelb2403@gmail.com>,
"Andy Shevchenko" <andriy.shevchenko@intel.com>
Subject: [PATCH v3] iio: magnetometer: bmc150_magn: Used guard() for mutex protection
Date: Tue, 3 Feb 2026 21:12:41 -0500 [thread overview]
Message-ID: <20260204021241.53891-1-neelb2403@gmail.com> (raw)
In-Reply-To: <20260204010529.48000-1-neelb2403@gmail.com>
Replaced the manual mutex lock/unlock calls using guard() to simplify
the error handling and reduce goto statement usage.
By using RAII-style cleanup, it ensures the mutex is always released
when exiting the function, regardless of the return path taken.
Signed-off-by: Neel Bullywon <neelb2403@gmail.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
---
drivers/iio/magnetometer/bmc150_magn.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index 6a73f6e2f1f0..bd2706c2078d 100644
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -794,32 +794,25 @@ static int bmc150_magn_data_rdy_trigger_set_state(struct iio_trigger *trig,
{
struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
struct bmc150_magn_data *data = iio_priv(indio_dev);
- int ret = 0;
+ int ret;
+
+ guard(mutex)(&data->mutex);
- mutex_lock(&data->mutex);
if (state == data->dready_trigger_on)
- goto err_unlock;
+ return 0;
ret = regmap_update_bits(data->regmap, BMC150_MAGN_REG_INT_DRDY,
BMC150_MAGN_MASK_DRDY_EN,
state << BMC150_MAGN_SHIFT_DRDY_EN);
if (ret < 0)
- goto err_unlock;
+ return ret;
data->dready_trigger_on = state;
- if (state) {
- ret = bmc150_magn_reset_intr(data);
- if (ret < 0)
- goto err_unlock;
- }
- mutex_unlock(&data->mutex);
+ if (state)
+ return bmc150_magn_reset_intr(data);
return 0;
-
-err_unlock:
- mutex_unlock(&data->mutex);
- return ret;
}
static const struct iio_trigger_ops bmc150_magn_trigger_ops = {
--
2.44.0
next prev parent reply other threads:[~2026-02-04 2:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-04 1:05 [PATCH v2] iio: magnetometer: bmc150_magn: Used guard() for mutex protection Neel Bullywon
2026-02-04 1:09 ` David Lechner
2026-02-04 1:15 ` Andy Shevchenko
2026-02-04 2:12 ` Neel Bullywon [this message]
2026-02-05 20:25 ` [PATCH v3] " 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=20260204021241.53891-1-neelb2403@gmail.com \
--to=neelb2403@gmail.com \
--cc=andriy.shevchenko@intel.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 \
/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