[PATCH 5/6] iio: adc: ti-adc128s052: Simplify using guard(mutex)

From: Matti Vaittinen
Date: Mon Mar 31 2025 - 04:04:11 EST


Error path in ADC reading function can be slighly simplified using the
guard(mutex). Do just that.

Also, document the mutex purpose while at it.

Signed-off-by: Matti Vaittinen <mazziesaccount@xxxxxxxxx>
---
drivers/iio/adc/ti-adc128s052.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index 90b23c68daea..c68ee4e17a03 100644
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -9,6 +9,7 @@
* https://www.ti.com/lit/ds/symlink/adc124s021.pdf
*/

+#include <linux/cleanup.h>
#include <linux/err.h>
#include <linux/iio/iio.h>
#include <linux/mod_devicetable.h>
@@ -26,6 +27,7 @@ struct adc128 {
struct spi_device *spi;

struct regulator *reg;
+ /* Serialize the SPI 'write-channel + read data' accesses */
struct mutex lock;

__be16 buffer __aligned(IIO_DMA_MINALIGN);
@@ -39,18 +41,13 @@ static int adc128_adc_conversion(struct adc128 *adc, u8 channel)
msg[0] = channel << 3;
msg[1] = 0;

- mutex_lock(&adc->lock);
+ guard(mutex)(&adc->lock);

ret = spi_write(adc->spi, msg, 2);
- if (ret < 0) {
- mutex_unlock(&adc->lock);
+ if (ret < 0)
return ret;
- }

ret = spi_read(adc->spi, &adc->buffer, 2);
-
- mutex_unlock(&adc->lock);
-
if (ret < 0)
return ret;

--
2.48.1

Attachment: signature.asc
Description: PGP signature