From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Subject: Re: [PATCH] iio: frequency: adf4350: Replace indio_dev->mlock with own device lock
Date: Sat, 29 Aug 2020 16:48:19 +0100 [thread overview]
Message-ID: <20200829164819.7425030d@archlinux> (raw)
In-Reply-To: <20200826064257.53475-1-alexandru.ardelean@analog.com>
On Wed, 26 Aug 2020 09:42:57 +0300
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> From: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
>
> 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>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
> ---
> drivers/iio/frequency/adf4350.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
> index 409c9c47161e..3f37a57cd3c3 100644
> --- a/drivers/iio/frequency/adf4350.c
> +++ b/drivers/iio/frequency/adf4350.c
> @@ -47,6 +47,7 @@ struct adf4350_state {
> unsigned long regs[6];
> unsigned long regs_hw[6];
> unsigned long long freq_req;
> + struct mutex lock;
Same thing about need for a comment in the code on what the lock scope is.
I'm sure checkpatch used to moan about this. I guess maybe it stopped
doing so at some stage.
Jonathan
> /*
> * DMA (thus cache coherency maintenance) requires the
> * transfer buffers to live in their own cache lines.
> @@ -99,7 +100,7 @@ static int adf4350_reg_access(struct iio_dev *indio_dev,
> if (reg > ADF4350_REG5)
> return -EINVAL;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&st->lock);
> if (readval == NULL) {
> st->regs[reg] = writeval & ~(BIT(0) | BIT(1) | BIT(2));
> ret = adf4350_sync_config(st);
> @@ -107,7 +108,7 @@ static int adf4350_reg_access(struct iio_dev *indio_dev,
> *readval = st->regs_hw[reg];
> ret = 0;
> }
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&st->lock);
>
> return ret;
> }
> @@ -254,7 +255,7 @@ static ssize_t adf4350_write(struct iio_dev *indio_dev,
> if (ret)
> return ret;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&st->lock);
> switch ((u32)private) {
> case ADF4350_FREQ:
> ret = adf4350_set_freq(st, readin);
> @@ -295,7 +296,7 @@ static ssize_t adf4350_write(struct iio_dev *indio_dev,
> default:
> ret = -EINVAL;
> }
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&st->lock);
>
> return ret ? ret : len;
> }
> @@ -309,7 +310,7 @@ static ssize_t adf4350_read(struct iio_dev *indio_dev,
> unsigned long long val;
> int ret = 0;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&st->lock);
> switch ((u32)private) {
> case ADF4350_FREQ:
> val = (u64)((st->r0_int * st->r1_mod) + st->r0_fract) *
> @@ -338,7 +339,7 @@ static ssize_t adf4350_read(struct iio_dev *indio_dev,
> ret = -EINVAL;
> val = 0;
> }
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&st->lock);
>
> return ret < 0 ? ret : sprintf(buf, "%llu\n", val);
> }
> @@ -539,6 +540,8 @@ static int adf4350_probe(struct spi_device *spi)
> indio_dev->channels = &adf4350_chan;
> indio_dev->num_channels = 1;
>
> + mutex_init(&st->lock);
> +
> st->chspc = pdata->channel_spacing;
> if (clk) {
> st->clk = clk;
next prev parent reply other threads:[~2020-08-29 15:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 6:42 [PATCH] iio: frequency: adf4350: Replace indio_dev->mlock with own device lock Alexandru Ardelean
2020-08-29 15:48 ` Jonathan Cameron [this message]
2020-09-16 9:27 ` [PATCH v2] " Alexandru Ardelean
2020-09-16 17:58 ` Jonathan Cameron
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=20200829164819.7425030d@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.ardelean@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sergiu.cuciurean@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.