On 13/03/17 22:04, Aishwarya Pant wrote:
> The IIO subsystem is redefining iio_dev mlock to be used by IIO core
> only for protecting device operating mode changes.
>
> In driver ad7746 wherever mlock was used to protect hardware state
> changes, it has been replaced with a driver private lock.
>
> Signed-off-by: Aishwarya Pant <aishpant@xxxxxxxxx>
Good. One minor comment. Please do make sure to list the driver name
in the patch description.
staging:iio:cdc:ad7746... here would be great.
Makes it easy to spot changes to drivers of interest to a
given reader of the mailing list or git history.
Applied with that change to the togreg branch of iio.git and
pushed out as testing.
Thanks,
Jonathan
> ---
> drivers/staging/iio/cdc/ad7746.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
> index 81f8b9e..6e3f99c 100644
> --- a/drivers/staging/iio/cdc/ad7746.c
> +++ b/drivers/staging/iio/cdc/ad7746.c
> @@ -91,6 +91,7 @@
>
> struct ad7746_chip_info {
> struct i2c_client *client;
> + struct mutex lock; /* protect sensor state */
> /*
> * Capacitive channel digital filter setup;
> * conversion time/update rate setup per channel
> @@ -298,11 +299,11 @@ static inline ssize_t ad7746_start_calib(struct device *dev,
> if (!doit)
> return 0;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&chip->lock);
> regval |= chip->config;
> ret = i2c_smbus_write_byte_data(chip->client, AD7746_REG_CFG, regval);
> if (ret < 0) {
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&chip->lock);
> return ret;
> }
>
> @@ -310,12 +311,12 @@ static inline ssize_t ad7746_start_calib(struct device *dev,
> msleep(20);
> ret = i2c_smbus_read_byte_data(chip->client, AD7746_REG_CFG);
> if (ret < 0) {
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&chip->lock);
> return ret;
> }
> } while ((ret == regval) && timeout--);
>
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&chip->lock);
>
> return len;
> }
> @@ -426,7 +427,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
> struct ad7746_chip_info *chip = iio_priv(indio_dev);
> int ret, reg;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&chip->lock);
>
> switch (mask) {
> case IIO_CHAN_INFO_CALIBSCALE:
> @@ -521,7 +522,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
> }
>
> out:
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&chip->lock);
> return ret;
> }
>
> @@ -534,7 +535,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
> int ret, delay, idx;
> u8 regval, reg;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&chip->lock);
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> @@ -658,7 +659,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
> ret = -EINVAL;
> }
> out:
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&chip->lock);
> return ret;
> }
>
> @@ -686,6 +687,7 @@ static int ad7746_probe(struct i2c_client *client,
> if (!indio_dev)
> return -ENOMEM;
> chip = iio_priv(indio_dev);
> + mutex_init(&chip->lock);
> /* this is only used for device removal purposes */
> i2c_set_clientdata(client, indio_dev);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
