Commit 3d329bcd authored by Jonathan Cameron's avatar Jonathan Cameron

iio: adc: max1363: Use automatic cleanup for locks and iio mode claiming.

This simplifies error return paths.
Reviewed-by: default avatarNuno Sa <nuno.a@analog.com>
Link: https://lore.kernel.org/r/20240128150537.44592-6-jic23@kernel.orgSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent b6dde109
...@@ -357,16 +357,13 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev, ...@@ -357,16 +357,13 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
int *val, int *val,
long m) long m)
{ {
int ret = 0; iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
s32 data; s32 data;
u8 rxbuf[2]; u8 rxbuf[2];
struct max1363_state *st = iio_priv(indio_dev); struct max1363_state *st = iio_priv(indio_dev);
struct i2c_client *client = st->client; struct i2c_client *client = st->client;
ret = iio_device_claim_direct_mode(indio_dev); guard(mutex)(&st->lock);
if (ret)
return ret;
mutex_lock(&st->lock);
/* /*
* If monitor mode is enabled, the method for reading a single * If monitor mode is enabled, the method for reading a single
...@@ -375,44 +372,40 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev, ...@@ -375,44 +372,40 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
* *
* Also, cannot read directly if buffered capture enabled. * Also, cannot read directly if buffered capture enabled.
*/ */
if (st->monitor_on) { if (st->monitor_on)
ret = -EBUSY; return -EBUSY;
goto error_ret;
}
/* Check to see if current scan mode is correct */ /* Check to see if current scan mode is correct */
if (st->current_mode != &max1363_mode_table[chan->address]) { if (st->current_mode != &max1363_mode_table[chan->address]) {
int ret;
/* Update scan mode if needed */ /* Update scan mode if needed */
st->current_mode = &max1363_mode_table[chan->address]; st->current_mode = &max1363_mode_table[chan->address];
ret = max1363_set_scan_mode(st); ret = max1363_set_scan_mode(st);
if (ret < 0) if (ret < 0)
goto error_ret; return ret;
} }
if (st->chip_info->bits != 8) { if (st->chip_info->bits != 8) {
/* Get reading */ /* Get reading */
data = st->recv(client, rxbuf, 2); data = st->recv(client, rxbuf, 2);
if (data < 0) { if (data < 0)
ret = data; return data;
goto error_ret;
}
data = (rxbuf[1] | rxbuf[0] << 8) & data = (rxbuf[1] | rxbuf[0] << 8) &
((1 << st->chip_info->bits) - 1); ((1 << st->chip_info->bits) - 1);
} else { } else {
/* Get reading */ /* Get reading */
data = st->recv(client, rxbuf, 1); data = st->recv(client, rxbuf, 1);
if (data < 0) { if (data < 0)
ret = data; return data;
goto error_ret;
}
data = rxbuf[0]; data = rxbuf[0];
} }
*val = data; *val = data;
error_ret: return 0;
mutex_unlock(&st->lock); }
iio_device_release_direct_mode(indio_dev); unreachable();
return ret;
} }
static int max1363_read_raw(struct iio_dev *indio_dev, static int max1363_read_raw(struct iio_dev *indio_dev,
...@@ -710,9 +703,8 @@ static ssize_t max1363_monitor_store_freq(struct device *dev, ...@@ -710,9 +703,8 @@ static ssize_t max1363_monitor_store_freq(struct device *dev,
if (!found) if (!found)
return -EINVAL; return -EINVAL;
mutex_lock(&st->lock); scoped_guard(mutex, &st->lock)
st->monitor_speed = i; st->monitor_speed = i;
mutex_unlock(&st->lock);
return 0; return 0;
} }
...@@ -815,12 +807,11 @@ static int max1363_read_event_config(struct iio_dev *indio_dev, ...@@ -815,12 +807,11 @@ static int max1363_read_event_config(struct iio_dev *indio_dev,
int val; int val;
int number = chan->channel; int number = chan->channel;
mutex_lock(&st->lock); guard(mutex)(&st->lock);
if (dir == IIO_EV_DIR_FALLING) if (dir == IIO_EV_DIR_FALLING)
val = (1 << number) & st->mask_low; val = (1 << number) & st->mask_low;
else else
val = (1 << number) & st->mask_high; val = (1 << number) & st->mask_high;
mutex_unlock(&st->lock);
return val; return val;
} }
...@@ -962,15 +953,14 @@ static int max1363_write_event_config(struct iio_dev *indio_dev, ...@@ -962,15 +953,14 @@ static int max1363_write_event_config(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan, enum iio_event_type type, const struct iio_chan_spec *chan, enum iio_event_type type,
enum iio_event_direction dir, int state) enum iio_event_direction dir, int state)
{ {
int ret = 0;
struct max1363_state *st = iio_priv(indio_dev); struct max1363_state *st = iio_priv(indio_dev);
u16 unifiedmask;
iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
int number = chan->channel; int number = chan->channel;
u16 unifiedmask;
int ret;
ret = iio_device_claim_direct_mode(indio_dev); guard(mutex)(&st->lock);
if (ret)
return ret;
mutex_lock(&st->lock);
unifiedmask = st->mask_low | st->mask_high; unifiedmask = st->mask_low | st->mask_high;
if (dir == IIO_EV_DIR_FALLING) { if (dir == IIO_EV_DIR_FALLING) {
...@@ -981,7 +971,7 @@ static int max1363_write_event_config(struct iio_dev *indio_dev, ...@@ -981,7 +971,7 @@ static int max1363_write_event_config(struct iio_dev *indio_dev,
ret = __max1363_check_event_mask((1 << number), ret = __max1363_check_event_mask((1 << number),
unifiedmask); unifiedmask);
if (ret) if (ret)
goto error_ret; return ret;
st->mask_low |= (1 << number); st->mask_low |= (1 << number);
} }
} else { } else {
...@@ -991,17 +981,14 @@ static int max1363_write_event_config(struct iio_dev *indio_dev, ...@@ -991,17 +981,14 @@ static int max1363_write_event_config(struct iio_dev *indio_dev,
ret = __max1363_check_event_mask((1 << number), ret = __max1363_check_event_mask((1 << number),
unifiedmask); unifiedmask);
if (ret) if (ret)
goto error_ret; return ret;
st->mask_high |= (1 << number); st->mask_high |= (1 << number);
} }
} }
}
max1363_monitor_mode_update(st, !!(st->mask_high | st->mask_low)); max1363_monitor_mode_update(st, !!(st->mask_high | st->mask_low));
error_ret:
mutex_unlock(&st->lock);
iio_device_release_direct_mode(indio_dev);
return ret; return 0;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment