superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: humidity: hdc100x: Use guard(mutex) to simplify code flow 

By using autoreleasing on the lock a number of paths can use
direct returns allow earlier exit from functions.

Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Link: https://patch.msgid.link/20250331121317.1694135-11-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
pull/1259/head
Jonathan Cameron 2025-03-31 13:12:50 +01:00
parent 6c9dc1e8f2
commit d9e6b59e5b
1 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/iio/humidity/hdc100x.c
View File

@ -13,6 +13,7 @@
* https://www.ti.com/product/HDC1080/datasheet * https://www.ti.com/product/HDC1080/datasheet
*/ */
#include <linux/cleanup.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
@ -206,26 +207,21 @@ static int hdc100x_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_RAW: { case IIO_CHAN_INFO_RAW: {
int ret; int ret;
mutex_lock(&data->lock); guard(mutex)(&data->lock);
if (chan->type == IIO_CURRENT) { if (chan->type == IIO_CURRENT) {
*val = hdc100x_get_heater_status(data); *val = hdc100x_get_heater_status(data);
ret = IIO_VAL_INT; return IIO_VAL_INT;
} else {
ret = iio_device_claim_direct_mode(indio_dev);
if (ret) {
mutex_unlock(&data->lock);
return ret;
} }
ret = iio_device_claim_direct_mode(indio_dev);
if (ret)
return ret;
ret = hdc100x_get_measurement(data, chan); ret = hdc100x_get_measurement(data, chan);
iio_device_release_direct_mode(indio_dev); iio_device_release_direct_mode(indio_dev);
if (ret >= 0) { if (ret < 0)
*val = ret;
ret = IIO_VAL_INT;
}
}
mutex_unlock(&data->lock);
return ret; return ret;
*val = ret;
return IIO_VAL_INT;
} }
case IIO_CHAN_INFO_INT_TIME: case IIO_CHAN_INFO_INT_TIME:
*val = 0; *val = 0;
@ -256,26 +252,23 @@ static int hdc100x_write_raw(struct iio_dev *indio_dev,
int val, int val2, long mask) int val, int val2, long mask)
{ {
struct hdc100x_data *data = iio_priv(indio_dev); struct hdc100x_data *data = iio_priv(indio_dev);
int ret = -EINVAL;
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_INT_TIME: case IIO_CHAN_INFO_INT_TIME: {
if (val != 0) if (val != 0)
return -EINVAL; return -EINVAL;
mutex_lock(&data->lock); guard(mutex)(&data->lock);
ret = hdc100x_set_it_time(data, chan->address, val2); return hdc100x_set_it_time(data, chan->address, val2);
mutex_unlock(&data->lock); }
return ret; case IIO_CHAN_INFO_RAW: {
case IIO_CHAN_INFO_RAW:
if (chan->type != IIO_CURRENT || val2 != 0) if (chan->type != IIO_CURRENT || val2 != 0)
return -EINVAL; return -EINVAL;
mutex_lock(&data->lock); guard(mutex)(&data->lock);
ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_HEATER_EN, return hdc100x_update_config(data, HDC100X_REG_CONFIG_HEATER_EN,
val ? HDC100X_REG_CONFIG_HEATER_EN : 0); val ? HDC100X_REG_CONFIG_HEATER_EN : 0);
mutex_unlock(&data->lock); }
return ret;
default: default:
return -EINVAL; return -EINVAL;
} }
@ -284,27 +277,19 @@ static int hdc100x_write_raw(struct iio_dev *indio_dev,
static int hdc100x_buffer_postenable(struct iio_dev *indio_dev) static int hdc100x_buffer_postenable(struct iio_dev *indio_dev)
{ {
struct hdc100x_data *data = iio_priv(indio_dev); struct hdc100x_data *data = iio_priv(indio_dev);
int ret;
/* Buffer is enabled. First set ACQ Mode, then attach poll func */ /* Buffer is enabled. First set ACQ Mode, then attach poll func */
mutex_lock(&data->lock); guard(mutex)(&data->lock);
ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE, return hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE,
HDC100X_REG_CONFIG_ACQ_MODE); HDC100X_REG_CONFIG_ACQ_MODE);
mutex_unlock(&data->lock);
return ret;
} }
static int hdc100x_buffer_predisable(struct iio_dev *indio_dev) static int hdc100x_buffer_predisable(struct iio_dev *indio_dev)
{ {
struct hdc100x_data *data = iio_priv(indio_dev); struct hdc100x_data *data = iio_priv(indio_dev);
int ret;
mutex_lock(&data->lock); guard(mutex)(&data->lock);
ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE, 0); return hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE, 0);
mutex_unlock(&data->lock);
return ret;
} }
static const struct iio_buffer_setup_ops hdc_buffer_setup_ops = { static const struct iio_buffer_setup_ops hdc_buffer_setup_ops = {