mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-28 14:44:10 +08:00
iio: adc: ad4130: Use automatic cleanup of locks and direct mode.
Reduces boilerplate and allows for simpler to follow direct returns. Reviewed-by: Nuno Sa <nuno.a@analog.com> Link: https://lore.kernel.org/r/20240128150537.44592-10-jic23@kernel.org Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Jonathan Cameron
parent
fb1f19713d
commit
1fa220ec61
@ -887,9 +887,9 @@ static int ad4130_set_filter_mode(struct iio_dev *indio_dev,
|
||||
unsigned int old_fs;
|
||||
int ret = 0;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
if (setup_info->filter_mode == val)
|
||||
goto out;
|
||||
return 0;
|
||||
|
||||
old_fs = setup_info->fs;
|
||||
old_filter_mode = setup_info->filter_mode;
|
||||
@ -911,12 +911,10 @@ static int ad4130_set_filter_mode(struct iio_dev *indio_dev,
|
||||
if (ret) {
|
||||
setup_info->fs = old_fs;
|
||||
setup_info->filter_mode = old_filter_mode;
|
||||
return ret;
|
||||
}
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad4130_get_filter_mode(struct iio_dev *indio_dev,
|
||||
@ -927,9 +925,8 @@ static int ad4130_get_filter_mode(struct iio_dev *indio_dev,
|
||||
struct ad4130_setup_info *setup_info = &st->chans_info[channel].setup;
|
||||
enum ad4130_filter_mode filter_mode;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
filter_mode = setup_info->filter_mode;
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return filter_mode;
|
||||
}
|
||||
@ -971,7 +968,7 @@ static int ad4130_set_channel_pga(struct ad4130_state *st, unsigned int channel,
|
||||
struct ad4130_chan_info *chan_info = &st->chans_info[channel];
|
||||
struct ad4130_setup_info *setup_info = &chan_info->setup;
|
||||
unsigned int pga, old_pga;
|
||||
int ret = 0;
|
||||
int ret;
|
||||
|
||||
for (pga = 0; pga < AD4130_MAX_PGA; pga++)
|
||||
if (val == st->scale_tbls[setup_info->ref_sel][pga][0] &&
|
||||
@ -981,21 +978,20 @@ static int ad4130_set_channel_pga(struct ad4130_state *st, unsigned int channel,
|
||||
if (pga == AD4130_MAX_PGA)
|
||||
return -EINVAL;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
if (pga == setup_info->pga)
|
||||
goto out;
|
||||
return 0;
|
||||
|
||||
old_pga = setup_info->pga;
|
||||
setup_info->pga = pga;
|
||||
|
||||
ret = ad4130_write_channel_setup(st, channel, false);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
setup_info->pga = old_pga;
|
||||
return ret;
|
||||
}
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad4130_set_channel_freq(struct ad4130_state *st,
|
||||
@ -1004,26 +1000,25 @@ static int ad4130_set_channel_freq(struct ad4130_state *st,
|
||||
struct ad4130_chan_info *chan_info = &st->chans_info[channel];
|
||||
struct ad4130_setup_info *setup_info = &chan_info->setup;
|
||||
unsigned int fs, old_fs;
|
||||
int ret = 0;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
old_fs = setup_info->fs;
|
||||
|
||||
ad4130_freq_to_fs(setup_info->filter_mode, val, val2, &fs);
|
||||
|
||||
if (fs == setup_info->fs)
|
||||
goto out;
|
||||
return 0;
|
||||
|
||||
setup_info->fs = fs;
|
||||
|
||||
ret = ad4130_write_channel_setup(st, channel, false);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
setup_info->fs = old_fs;
|
||||
return ret;
|
||||
}
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _ad4130_read_sample(struct iio_dev *indio_dev, unsigned int channel,
|
||||
@ -1065,20 +1060,13 @@ static int _ad4130_read_sample(struct iio_dev *indio_dev, unsigned int channel,
|
||||
static int ad4130_read_sample(struct iio_dev *indio_dev, unsigned int channel,
|
||||
int *val)
|
||||
{
|
||||
struct ad4130_state *st = iio_priv(indio_dev);
|
||||
int ret;
|
||||
iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
|
||||
struct ad4130_state *st = iio_priv(indio_dev);
|
||||
|
||||
ret = iio_device_claim_direct_mode(indio_dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
ret = _ad4130_read_sample(indio_dev, channel, val);
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
iio_device_release_direct_mode(indio_dev);
|
||||
|
||||
return ret;
|
||||
guard(mutex)(&st->lock);
|
||||
return _ad4130_read_sample(indio_dev, channel, val);
|
||||
}
|
||||
unreachable();
|
||||
}
|
||||
|
||||
static int ad4130_read_raw(struct iio_dev *indio_dev,
|
||||
@ -1092,24 +1080,24 @@ static int ad4130_read_raw(struct iio_dev *indio_dev,
|
||||
switch (info) {
|
||||
case IIO_CHAN_INFO_RAW:
|
||||
return ad4130_read_sample(indio_dev, channel, val);
|
||||
case IIO_CHAN_INFO_SCALE:
|
||||
mutex_lock(&st->lock);
|
||||
case IIO_CHAN_INFO_SCALE: {
|
||||
guard(mutex)(&st->lock);
|
||||
*val = st->scale_tbls[setup_info->ref_sel][setup_info->pga][0];
|
||||
*val2 = st->scale_tbls[setup_info->ref_sel][setup_info->pga][1];
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return IIO_VAL_INT_PLUS_NANO;
|
||||
}
|
||||
case IIO_CHAN_INFO_OFFSET:
|
||||
*val = st->bipolar ? -BIT(chan->scan_type.realbits - 1) : 0;
|
||||
|
||||
return IIO_VAL_INT;
|
||||
case IIO_CHAN_INFO_SAMP_FREQ:
|
||||
mutex_lock(&st->lock);
|
||||
case IIO_CHAN_INFO_SAMP_FREQ: {
|
||||
guard(mutex)(&st->lock);
|
||||
ad4130_fs_to_freq(setup_info->filter_mode, setup_info->fs,
|
||||
val, val2);
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return IIO_VAL_INT_PLUS_NANO;
|
||||
}
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -1134,9 +1122,9 @@ static int ad4130_read_avail(struct iio_dev *indio_dev,
|
||||
|
||||
return IIO_AVAIL_LIST;
|
||||
case IIO_CHAN_INFO_SAMP_FREQ:
|
||||
mutex_lock(&st->lock);
|
||||
filter_config = &ad4130_filter_configs[setup_info->filter_mode];
|
||||
mutex_unlock(&st->lock);
|
||||
scoped_guard(mutex, &st->lock) {
|
||||
filter_config = &ad4130_filter_configs[setup_info->filter_mode];
|
||||
}
|
||||
|
||||
*vals = (int *)filter_config->samp_freq_avail;
|
||||
*length = filter_config->samp_freq_avail_len * 2;
|
||||
@ -1197,21 +1185,18 @@ static int ad4130_update_scan_mode(struct iio_dev *indio_dev,
|
||||
unsigned int val = 0;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
|
||||
for_each_set_bit(channel, scan_mask, indio_dev->num_channels) {
|
||||
ret = ad4130_set_channel_enable(st, channel, true);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
val++;
|
||||
}
|
||||
|
||||
st->num_enabled_channels = val;
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1232,22 +1217,19 @@ static int ad4130_set_fifo_watermark(struct iio_dev *indio_dev, unsigned int val
|
||||
*/
|
||||
eff = rounddown(AD4130_FIFO_SIZE, st->num_enabled_channels);
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
|
||||
ret = regmap_update_bits(st->regmap, AD4130_FIFO_CONTROL_REG,
|
||||
AD4130_FIFO_CONTROL_WM_MASK,
|
||||
FIELD_PREP(AD4130_FIFO_CONTROL_WM_MASK,
|
||||
ad4130_watermark_reg_val(eff)));
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
st->effective_watermark = eff;
|
||||
st->watermark = val;
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct iio_info ad4130_info = {
|
||||
@ -1265,26 +1247,21 @@ static int ad4130_buffer_postenable(struct iio_dev *indio_dev)
|
||||
struct ad4130_state *st = iio_priv(indio_dev);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
|
||||
ret = ad4130_set_watermark_interrupt_en(st, true);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = irq_set_irq_type(st->spi->irq, st->inv_irq_trigger);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = ad4130_set_fifo_mode(st, AD4130_FIFO_MODE_WM);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = ad4130_set_mode(st, AD4130_MODE_CONTINUOUS);
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return ret;
|
||||
return ad4130_set_mode(st, AD4130_MODE_CONTINUOUS);
|
||||
}
|
||||
|
||||
static int ad4130_buffer_predisable(struct iio_dev *indio_dev)
|
||||
@ -1293,23 +1270,23 @@ static int ad4130_buffer_predisable(struct iio_dev *indio_dev)
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
|
||||
ret = ad4130_set_mode(st, AD4130_MODE_IDLE);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = irq_set_irq_type(st->spi->irq, st->irq_trigger);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = ad4130_set_fifo_mode(st, AD4130_FIFO_MODE_DISABLED);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
ret = ad4130_set_watermark_interrupt_en(st, false);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* update_scan_mode() is not called in the disable path, disable all
|
||||
@ -1318,13 +1295,10 @@ static int ad4130_buffer_predisable(struct iio_dev *indio_dev)
|
||||
for (i = 0; i < indio_dev->num_channels; i++) {
|
||||
ret = ad4130_set_channel_enable(st, i, false);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
}
|
||||
|
||||
out:
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct iio_buffer_setup_ops ad4130_buffer_ops = {
|
||||
@ -1338,9 +1312,8 @@ static ssize_t hwfifo_watermark_show(struct device *dev,
|
||||
struct ad4130_state *st = iio_priv(dev_to_iio_dev(dev));
|
||||
unsigned int val;
|
||||
|
||||
mutex_lock(&st->lock);
|
||||
guard(mutex)(&st->lock);
|
||||
val = st->watermark;
|
||||
mutex_unlock(&st->lock);
|
||||
|
||||
return sysfs_emit(buf, "%d\n", val);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user