linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-iio@vger.kernel.org>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Michael Hennerich <Michael.Hennerich@analog.com>,
	"Stefan Popa" <stefan.popa@analog.com>,
	"Hartmut Knaack" <knaack.h@gmx.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Subject: Re: [PATCH] iio: dac: ad5446: Replace indio_dev->mlock with own device lock
Date: Sat, 16 May 2020 16:15:02 +0100	[thread overview]
Message-ID: <20200516161502.48a2a181@archlinux> (raw)
In-Reply-To: <20200514090048.80359-1-sergiu.cuciurean@analog.com>

On Thu, 14 May 2020 12:00:42 +0300
Sergiu Cuciurean <sergiu.cuciurean@analog.com> wrote:

> As part of the general cleanup of indio_dev->mlock, this change replaces
> it with a local lock on the device's state structure.
> 
> Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

> ---
>  drivers/iio/dac/ad5446.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
> index 9884e29b19b7..8f8afc8999bc 100644
> --- a/drivers/iio/dac/ad5446.c
> +++ b/drivers/iio/dac/ad5446.c
> @@ -33,6 +33,7 @@
>   * @chip_info:		chip model specific constants, available modes etc
>   * @reg:		supply regulator
>   * @vref_mv:		actual reference voltage used
> + * @lock		lock to protect the data buffer during write ops
>   */
>  
>  struct ad5446_state {
> @@ -43,6 +44,7 @@ struct ad5446_state {
>  	unsigned			cached_val;
>  	unsigned			pwr_down_mode;
>  	unsigned			pwr_down;
> +	struct mutex			lock;
>  };
>  
>  /**
> @@ -112,7 +114,7 @@ static ssize_t ad5446_write_dac_powerdown(struct iio_dev *indio_dev,
>  	if (ret)
>  		return ret;
>  
> -	mutex_lock(&indio_dev->mlock);
> +	mutex_lock(&st->lock);
>  	st->pwr_down = powerdown;
>  
>  	if (st->pwr_down) {
> @@ -123,7 +125,7 @@ static ssize_t ad5446_write_dac_powerdown(struct iio_dev *indio_dev,
>  	}
>  
>  	ret = st->chip_info->write(st, val);
> -	mutex_unlock(&indio_dev->mlock);
> +	mutex_unlock(&st->lock);
>  
>  	return ret ? ret : len;
>  }
> @@ -197,11 +199,11 @@ static int ad5446_write_raw(struct iio_dev *indio_dev,
>  			return -EINVAL;
>  
>  		val <<= chan->scan_type.shift;
> -		mutex_lock(&indio_dev->mlock);
> +		mutex_lock(&st->lock);
>  		st->cached_val = val;
>  		if (!st->pwr_down)
>  			ret = st->chip_info->write(st, val);
> -		mutex_unlock(&indio_dev->mlock);
> +		mutex_unlock(&st->lock);
>  		break;
>  	default:
>  		ret = -EINVAL;
> @@ -256,6 +258,8 @@ static int ad5446_probe(struct device *dev, const char *name,
>  	indio_dev->channels = &st->chip_info->channel;
>  	indio_dev->num_channels = 1;
>  
> +	mutex_init(&st->lock);
> +
>  	st->pwr_down_mode = MODE_PWRDWN_1k;
>  
>  	if (st->chip_info->int_vref_mv)


      reply	other threads:[~2020-05-16 15:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-14  9:00 [PATCH] iio: dac: ad5446: Replace indio_dev->mlock with own device lock Sergiu Cuciurean
2020-05-16 15:15 ` Jonathan Cameron [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200516161502.48a2a181@archlinux \
    --to=jic23@kernel.org \
    --cc=Michael.Hennerich@analog.com \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    --cc=sergiu.cuciurean@analog.com \
    --cc=stefan.popa@analog.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).