Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1607000

Re: [PATCH] staging: ad7759: Replace mlock with driver private lock

Show all headers | View raw

On 20/03/17 16:09, Arushi Singhal wrote:
> The IIO subsystem is redefining iio_dev->mlock to be used by
> the IIO core only for protecting device operating mode changes.
> ie. Changes between INDIO_DIRECT_MODE, INDIO_BUFFER_* modes.
> 
> In this driver, mlock was being used to protect hardware state
> changes.  Replace it with a lock in the devices global data.
> 
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
>  drivers/staging/iio/meter/ade7759.c | 4 ++--
>  drivers/staging/iio/meter/ade7759.h | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
> index 944ee3401029..1d1e0b33021f 100644
> --- a/drivers/staging/iio/meter/ade7759.c
> +++ b/drivers/staging/iio/meter/ade7759.c
> @@ -381,7 +381,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,
>  	if (!val)
>  		return -EINVAL;
>  
> -	mutex_lock(&indio_dev->mlock);
> +	mutex_lock(&st->buf_lock);
>  
>  	t = 27900 / val;
>  	if (t > 0)
> @@ -402,7 +402,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,
Deadlock as this call also take the buf_lock mutex..


>  	ret = ade7759_spi_write_reg_16(dev, ADE7759_MODE, reg);
>  
>  out:
> -	mutex_unlock(&indio_dev->mlock);
> +	mutex_unlock(&st->buf_lock);
>  
>  	return ret ? ret : len;
>  }
> diff --git a/drivers/staging/iio/meter/ade7759.h b/drivers/staging/iio/meter/ade7759.h
> index f0716d2fdf8e..4f69bb93cc45 100644
> --- a/drivers/staging/iio/meter/ade7759.h
> +++ b/drivers/staging/iio/meter/ade7759.h
> @@ -42,6 +42,7 @@
>   * @buf_lock:		mutex to protect tx and rx
>   * @tx:			transmit buffer
>   * @rx:			receive buffer
> + * @lock		protect sensor state
?
>   **/
>  struct ade7759_state {
>  	struct spi_device	*us;
> 

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] staging: ad7759: Replace mlock with driver private lock Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-20 17:20 +0100
  Re: [PATCH] staging: ad7759: Replace mlock with driver private lock Jonathan Cameron <jic23@kernel.org> - 2017-03-22 21:40 +0100

csiph-web