summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>2024-12-06 14:13:29 +0300
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2024-12-11 22:18:37 +0300
commit5d7fb2d589c56877bf220f73debd134c09e8209f (patch)
tree6b0269f2fe66309b3f90d9249187462da28eedaa
parentb7549624af04eb52cb28df57bee2bcc88be1adc0 (diff)
downloadlinux-5d7fb2d589c56877bf220f73debd134c09e8209f.tar.xz
iio: adc: rzg2l_adc: Simplify the locking scheme in rzg2l_adc_read_raw()
Simplify the locking scheme in rzg2l_adc_read_raw() by using guard(mutex)(). Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Link: https://patch.msgid.link/20241206111337.726244-8-claudiu.beznea.uj@bp.renesas.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-rw-r--r--drivers/iio/adc/rzg2l_adc.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/iio/adc/rzg2l_adc.c b/drivers/iio/adc/rzg2l_adc.c
index aa471fb495dc..7da84224a292 100644
--- a/drivers/iio/adc/rzg2l_adc.c
+++ b/drivers/iio/adc/rzg2l_adc.c
@@ -8,6 +8,7 @@
*/
#include <linux/bitfield.h>
+#include <linux/cleanup.h>
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/iio/iio.h>
@@ -220,21 +221,21 @@ static int rzg2l_adc_read_raw(struct iio_dev *indio_dev,
u8 ch;
switch (mask) {
- case IIO_CHAN_INFO_RAW:
+ case IIO_CHAN_INFO_RAW: {
if (chan->type != IIO_VOLTAGE)
return -EINVAL;
- mutex_lock(&adc->lock);
+ guard(mutex)(&adc->lock);
+
ch = chan->channel & RZG2L_ADC_CHN_MASK;
ret = rzg2l_adc_conversion(indio_dev, adc, ch);
- if (ret) {
- mutex_unlock(&adc->lock);
+ if (ret)
return ret;
- }
+
*val = adc->last_val[ch];
- mutex_unlock(&adc->lock);
return IIO_VAL_INT;
+ }
default:
return -EINVAL;