Commit 5d142d41 authored by Nuno Sá's avatar Nuno Sá Committed by Jonathan Cameron

iio: adis16136: make use of adis lock helpers

Use the adis lib lock helpers to lock the device. This makes things
consistent with other users of the library.
Signed-off-by: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20210520115909.466275-3-nuno.sa@analog.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 0990c6e4
...@@ -223,13 +223,12 @@ static ssize_t adis16136_read_frequency(struct device *dev, ...@@ -223,13 +223,12 @@ static ssize_t adis16136_read_frequency(struct device *dev,
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct adis16136 *adis16136 = iio_priv(indio_dev); struct adis16136 *adis16136 = iio_priv(indio_dev);
struct mutex *slock = &adis16136->adis.state_lock;
unsigned int freq; unsigned int freq;
int ret; int ret;
mutex_lock(slock); adis_dev_lock(&adis16136->adis);
ret = __adis16136_get_freq(adis16136, &freq); ret = __adis16136_get_freq(adis16136, &freq);
mutex_unlock(slock); adis_dev_unlock(&adis16136->adis);
if (ret) if (ret)
return ret; return ret;
...@@ -254,11 +253,10 @@ static const unsigned adis16136_3db_divisors[] = { ...@@ -254,11 +253,10 @@ static const unsigned adis16136_3db_divisors[] = {
static int adis16136_set_filter(struct iio_dev *indio_dev, int val) static int adis16136_set_filter(struct iio_dev *indio_dev, int val)
{ {
struct adis16136 *adis16136 = iio_priv(indio_dev); struct adis16136 *adis16136 = iio_priv(indio_dev);
struct mutex *slock = &adis16136->adis.state_lock;
unsigned int freq; unsigned int freq;
int i, ret; int i, ret;
mutex_lock(slock); adis_dev_lock(&adis16136->adis);
ret = __adis16136_get_freq(adis16136, &freq); ret = __adis16136_get_freq(adis16136, &freq);
if (ret) if (ret)
goto out_unlock; goto out_unlock;
...@@ -270,7 +268,7 @@ static int adis16136_set_filter(struct iio_dev *indio_dev, int val) ...@@ -270,7 +268,7 @@ static int adis16136_set_filter(struct iio_dev *indio_dev, int val)
ret = __adis_write_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, i); ret = __adis_write_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, i);
out_unlock: out_unlock:
mutex_unlock(slock); adis_dev_unlock(&adis16136->adis);
return ret; return ret;
} }
...@@ -278,12 +276,11 @@ static int adis16136_set_filter(struct iio_dev *indio_dev, int val) ...@@ -278,12 +276,11 @@ static int adis16136_set_filter(struct iio_dev *indio_dev, int val)
static int adis16136_get_filter(struct iio_dev *indio_dev, int *val) static int adis16136_get_filter(struct iio_dev *indio_dev, int *val)
{ {
struct adis16136 *adis16136 = iio_priv(indio_dev); struct adis16136 *adis16136 = iio_priv(indio_dev);
struct mutex *slock = &adis16136->adis.state_lock;
unsigned int freq; unsigned int freq;
uint16_t val16; uint16_t val16;
int ret; int ret;
mutex_lock(slock); adis_dev_lock(&adis16136->adis);
ret = __adis_read_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, ret = __adis_read_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT,
&val16); &val16);
...@@ -297,7 +294,7 @@ static int adis16136_get_filter(struct iio_dev *indio_dev, int *val) ...@@ -297,7 +294,7 @@ static int adis16136_get_filter(struct iio_dev *indio_dev, int *val)
*val = freq / adis16136_3db_divisors[val16 & 0x07]; *val = freq / adis16136_3db_divisors[val16 & 0x07];
err_unlock: err_unlock:
mutex_unlock(slock); adis_dev_unlock(&adis16136->adis);
return ret ? ret : IIO_VAL_INT; return ret ? ret : IIO_VAL_INT;
} }
......
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