diff options
| author |   Alexandru Ardelean <alexandru.ardelean@analog.com> | 2019-11-22 15:24:17 +0200 |
|---|---|---|
| committer |   Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2019-11-23 12:13:35 +0000 |
| commit | c5485a5d6a5f7d00ca4aba6698526c5ae3f2a1a2 (patch) | |
| tree | bf48c48ae5c1952f6a78c692d6cea7713c4ebc20 /drivers/iio/imu | |
| parent | iio: imu: adis: protect initial startup routine with state lock (diff) | |
| download | linux-dev-c5485a5d6a5f7d00ca4aba6698526c5ae3f2a1a2.tar.xz linux-dev-c5485a5d6a5f7d00ca4aba6698526c5ae3f2a1a2.zip | |
iio: imu: adis: group single conversion under a single state lock
The single conversion function does a series of reads + writes. This change
extends the use of the state_lock for the entire set of operations.
Previously, indio_dev's mlock was used. This change also removes the use of
this lock.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/imu')
| -rw-r--r-- | drivers/iio/imu/adis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c index 10b8922fd51b..c53f3ed3cb97 100644 --- a/drivers/iio/imu/adis.c +++ b/drivers/iio/imu/adis.c @@ -404,15 +404,15 @@ int adis_single_conversion(struct iio_dev *indio_dev, unsigned int uval; int ret; - mutex_lock(&indio_dev->mlock); + mutex_lock(&adis->state_lock); - ret = adis_read_reg(adis, chan->address, &uval, + ret = __adis_read_reg(adis, chan->address, &uval, chan->scan_type.storagebits / 8); if (ret) goto err_unlock; if (uval & error_mask) { - ret = adis_check_status(adis); + ret = __adis_check_status(adis); if (ret) goto err_unlock; } @@ -424,7 +424,7 @@ int adis_single_conversion(struct iio_dev *indio_dev, ret = IIO_VAL_INT; err_unlock: - mutex_unlock(&indio_dev->mlock); + mutex_unlock(&adis->state_lock); return ret; } EXPORT_SYMBOL_GPL(adis_single_conversion); |