From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 10/10] iio: imu: adis16480: use state lock for filter freq set
Date: Sun, 6 Oct 2019 10:24:01 +0100 [thread overview]
Message-ID: <20191006102401.43be8398@archlinux> (raw)
In-Reply-To: <20190926111812.15957-11-alexandru.ardelean@analog.com>
On Thu, 26 Sep 2019 14:18:12 +0300
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> It's the only operation that does 2 operations (a read & a write), so the
> unlocked functions can be used under a single state lock.
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@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/imu/adis16480.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
> index dc13d8a33612..01dae50e985b 100644
> --- a/drivers/iio/imu/adis16480.c
> +++ b/drivers/iio/imu/adis16480.c
> @@ -550,6 +550,7 @@ static int adis16480_set_filter_freq(struct iio_dev *indio_dev,
> const struct iio_chan_spec *chan, unsigned int freq)
> {
> struct adis16480 *st = iio_priv(indio_dev);
> + struct mutex *slock = &st->adis.state_lock;
> unsigned int enable_mask, offset, reg;
> unsigned int diff, best_diff;
> unsigned int i, best_freq;
> @@ -560,9 +561,11 @@ static int adis16480_set_filter_freq(struct iio_dev *indio_dev,
> offset = ad16480_filter_data[chan->scan_index][1];
> enable_mask = BIT(offset + 2);
>
> - ret = adis_read_reg_16(&st->adis, reg, &val);
> + mutex_lock(slock);
> +
> + ret = __adis_read_reg_16(&st->adis, reg, &val);
> if (ret < 0)
> - return ret;
> + goto out_unlock;
>
> if (freq == 0) {
> val &= ~enable_mask;
> @@ -584,7 +587,11 @@ static int adis16480_set_filter_freq(struct iio_dev *indio_dev,
> val |= enable_mask;
> }
>
> - return adis_write_reg_16(&st->adis, reg, val);
> + ret = __adis_write_reg_16(&st->adis, reg, val);
> +out_unlock:
> + mutex_unlock(slock);
> +
> + return ret;
> }
>
> static int adis16480_read_raw(struct iio_dev *indio_dev,
prev parent reply other threads:[~2019-10-06 9:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 11:18 [PATCH 00/10] iio: imu: adis: cleanup lock usage Alexandru Ardelean
2019-09-26 11:18 ` [PATCH 01/10] iio: imu: adis: rename txrx_lock -> state_lock Alexandru Ardelean
2019-10-06 8:53 ` Jonathan Cameron
2019-10-06 9:06 ` Jonathan Cameron
2019-10-07 10:18 ` Ardelean, Alexandru
2019-09-26 11:18 ` [PATCH 02/10] iio: imu: adis: add unlocked read/write function versions Alexandru Ardelean
2019-10-06 9:12 ` Jonathan Cameron
2019-10-07 21:16 ` Jonathan Cameron
2019-10-08 6:54 ` Ardelean, Alexandru
2019-10-08 8:47 ` Ardelean, Alexandru
2019-10-08 8:58 ` Ardelean, Alexandru
2019-10-12 13:40 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 03/10] iio: imu: adis[16480]: group RW into a single lock in adis_enable_irq() Alexandru Ardelean
2019-10-06 9:13 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 04/10] iio: imu: adis: create an unlocked version of adis_check_status() Alexandru Ardelean
2019-10-06 9:13 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 05/10] iio: imu: adis: create an unlocked version of adis_reset() Alexandru Ardelean
2019-10-06 9:19 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 06/10] iio: imu: adis: protect initial startup routine with state lock Alexandru Ardelean
2019-10-06 9:20 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 07/10] iio: imu: adis: group single conversion under a single " Alexandru Ardelean
2019-10-06 9:20 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 08/10] iio: imu: adis16400: rework locks using ADIS library's " Alexandru Ardelean
2019-10-06 9:20 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 09/10] iio: gyro: adis16136: " Alexandru Ardelean
2019-10-06 9:22 ` Jonathan Cameron
2019-09-26 11:18 ` [PATCH 10/10] iio: imu: adis16480: use state lock for filter freq set Alexandru Ardelean
2019-10-06 9:24 ` 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=20191006102401.43be8398@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.ardelean@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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.