[PATCH] iio: light: ltr501: Use automatic cleanup of locks

[rafasales em usp.br]

From: "Rafael B. Sales" <rafasales em usp.br>

Replace `mutex_lock` and `mutex_unlock` with `guard(mutex)` and
scoped_guard(mutex)` to reduce boilerplate and allow for
easy-to-read code blocks.

Signed-off-by: Rafael B. Sales <rafasales em usp.br>
Co-developed-by: Gustavo C. Arakaki <gustavo.arakaki em usp.br>
Signed-off-by: Gustavo C. Arakaki <gustavo.arakaki em usp.br>
---
 drivers/iio/light/ltr501.c | 44 +++++++++++++-------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
index 4d99ae336f61..b9aae948ad3b 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -242,9 +242,8 @@ static int ltr501_als_write_samp_freq(struct ltr501_data *data,
 	if (i < 0)
 		return i;
 
-	mutex_lock(&data->lock_als);
+	guard(mutex)(&data->lock_als);
 	ret = regmap_field_write(data->reg_als_rate, i);
-	mutex_unlock(&data->lock_als);
 
 	return ret;
 }
@@ -261,9 +260,8 @@ static int ltr501_ps_write_samp_freq(struct ltr501_data *data,
 	if (i < 0)
 		return i;
 
-	mutex_lock(&data->lock_ps);
+	guard(mutex)(&data->lock_ps);
 	ret = regmap_field_write(data->reg_ps_rate, i);
-	mutex_unlock(&data->lock_ps);
 
 	return ret;
 }
@@ -487,9 +485,8 @@ static int ltr501_write_intr_prst(struct ltr501_data *data,
 		if (new_val < 0 || new_val > 0x0f)
 			return -EINVAL;
 
-		mutex_lock(&data->lock_als);
+		guard(mutex)(&data->lock_als);
 		ret = regmap_field_write(data->reg_als_prst, new_val);
-		mutex_unlock(&data->lock_als);
 		if (ret >= 0)
 			data->als_period = period;
 
@@ -507,9 +504,8 @@ static int ltr501_write_intr_prst(struct ltr501_data *data,
 		if (new_val < 0 || new_val > 0x0f)
 			return -EINVAL;
 
-		mutex_lock(&data->lock_ps);
+		guard(mutex)(&data->lock_ps);
 		ret = regmap_field_write(data->reg_ps_prst, new_val);
-		mutex_unlock(&data->lock_ps);
 		if (ret >= 0)
 			data->ps_period = period;
 
@@ -651,18 +647,16 @@ static int ltr501_read_info_raw(struct ltr501_data *data,
 
 	switch (chan->type) {
 	case IIO_INTENSITY:
-		mutex_lock(&data->lock_als);
+		guard(mutex)(&data->lock_als);
 		ret = ltr501_read_als(data, buf);
-		mutex_unlock(&data->lock_als);
 		if (ret < 0)
 			return ret;
 		*val = le16_to_cpu(chan->address == LTR501_ALS_DATA1 ?
 				   buf[0] : buf[1]);
 		return IIO_VAL_INT;
 	case IIO_PROXIMITY:
-		mutex_lock(&data->lock_ps);
+		guard(mutex)(&data->lock_ps);
 		ret = ltr501_read_ps(data);
-		mutex_unlock(&data->lock_ps);
 		if (ret < 0)
 			return ret;
 		*val = ret & LTR501_PS_DATA_MASK;
@@ -687,9 +681,8 @@ static int ltr501_read_raw(struct iio_dev *indio_dev,
 			if (!iio_device_claim_direct(indio_dev))
 				return -EBUSY;
 
-			mutex_lock(&data->lock_als);
-			ret = ltr501_read_als(data, buf);
-			mutex_unlock(&data->lock_als);
+			scoped_guard(mutex, &data->lock_als)
+				ret = ltr501_read_als(data, buf);
 			iio_device_release_direct(indio_dev);
 			if (ret < 0)
 				return ret;
@@ -802,9 +795,8 @@ static int __ltr501_write_raw(struct iio_dev *indio_dev,
 			if (val != 0)
 				return -EINVAL;
 
-			mutex_lock(&data->lock_als);
+			guard(mutex)(&data->lock_als);
 			ret = ltr501_set_it_time(data, val2);
-			mutex_unlock(&data->lock_als);
 			return ret;
 		default:
 			return -EINVAL;
@@ -953,18 +945,16 @@ static int ltr501_write_thresh(struct iio_dev *indio_dev,
 			return -EINVAL;
 		switch (dir) {
 		case IIO_EV_DIR_RISING:
-			mutex_lock(&data->lock_als);
+			guard(mutex)(&data->lock_als);
 			ret = regmap_bulk_write(data->regmap,
 						LTR501_ALS_THRESH_UP,
 						&val, 2);
-			mutex_unlock(&data->lock_als);
 			return ret;
 		case IIO_EV_DIR_FALLING:
-			mutex_lock(&data->lock_als);
+			guard(mutex)(&data->lock_als);
 			ret = regmap_bulk_write(data->regmap,
 						LTR501_ALS_THRESH_LOW,
 						&val, 2);
-			mutex_unlock(&data->lock_als);
 			return ret;
 		default:
 			return -EINVAL;
@@ -974,18 +964,16 @@ static int ltr501_write_thresh(struct iio_dev *indio_dev,
 			return -EINVAL;
 		switch (dir) {
 		case IIO_EV_DIR_RISING:
-			mutex_lock(&data->lock_ps);
+			guard(mutex)(&data->lock_ps);
 			ret = regmap_bulk_write(data->regmap,
 						LTR501_PS_THRESH_UP,
 						&val, 2);
-			mutex_unlock(&data->lock_ps);
 			return ret;
 		case IIO_EV_DIR_FALLING:
-			mutex_lock(&data->lock_ps);
+			guard(mutex)(&data->lock_ps);
 			ret = regmap_bulk_write(data->regmap,
 						LTR501_PS_THRESH_LOW,
 						&val, 2);
-			mutex_unlock(&data->lock_ps);
 			return ret;
 		default:
 			return -EINVAL;
@@ -1082,14 +1070,12 @@ static int ltr501_write_event_config(struct iio_dev *indio_dev,
 
 	switch (chan->type) {
 	case IIO_INTENSITY:
-		mutex_lock(&data->lock_als);
+		guard(mutex)(&data->lock_als);
 		ret = regmap_field_write(data->reg_als_intr, state);
-		mutex_unlock(&data->lock_als);
 		return ret;
 	case IIO_PROXIMITY:
-		mutex_lock(&data->lock_ps);
+		guard(mutex)(&data->lock_ps);
 		ret = regmap_field_write(data->reg_ps_intr, state);
-		mutex_unlock(&data->lock_ps);
 		return ret;
 	default:
 		return -EINVAL;
-- 
2.53.0