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 09/10] iio: gyro: adis16136: rework locks using ADIS library's state lock
Date: Sun, 6 Oct 2019 10:22:44 +0100 [thread overview]
Message-ID: <20191006102244.719d3941@archlinux> (raw)
In-Reply-To: <20190926111812.15957-10-alexandru.ardelean@analog.com>
On Thu, 26 Sep 2019 14:18:11 +0300
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> This replaces indio_dev's mlock with the state lock/mutex from the ADIS
> library.
>
> The __adis16136_get_freq() function has been prefixed to mark it as
> unlocked. The adis16136_{set,get}_filter() functions now hold the state
> lock for all the ops that they do.
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/gyro/adis16136.c | 31 +++++++++++++++++++++----------
> 1 file changed, 21 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/iio/gyro/adis16136.c b/drivers/iio/gyro/adis16136.c
> index 5bec7ad53d8b..2d2c48f0b996 100644
> --- a/drivers/iio/gyro/adis16136.c
> +++ b/drivers/iio/gyro/adis16136.c
> @@ -185,12 +185,12 @@ static int adis16136_set_freq(struct adis16136 *adis16136, unsigned int freq)
> return adis_write_reg_16(&adis16136->adis, ADIS16136_REG_SMPL_PRD, t);
> }
>
> -static int adis16136_get_freq(struct adis16136 *adis16136, unsigned int *freq)
> +static int __adis16136_get_freq(struct adis16136 *adis16136, unsigned int *freq)
> {
> uint16_t t;
> int ret;
>
> - ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_SMPL_PRD, &t);
> + ret = __adis_read_reg_16(&adis16136->adis, ADIS16136_REG_SMPL_PRD, &t);
> if (ret < 0)
> return ret;
>
> @@ -224,10 +224,13 @@ static ssize_t adis16136_read_frequency(struct device *dev,
> {
> struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct adis16136 *adis16136 = iio_priv(indio_dev);
> + struct mutex *slock = &adis16136->adis.state_lock;
> unsigned int freq;
> int ret;
>
> - ret = adis16136_get_freq(adis16136, &freq);
> + mutex_lock(slock);
> + ret = __adis16136_get_freq(adis16136, &freq);
> + mutex_unlock(slock);
> if (ret < 0)
> return ret;
>
> @@ -252,42 +255,50 @@ static const unsigned adis16136_3db_divisors[] = {
> static int adis16136_set_filter(struct iio_dev *indio_dev, int val)
> {
> struct adis16136 *adis16136 = iio_priv(indio_dev);
> + struct mutex *slock = &adis16136->adis.state_lock;
> unsigned int freq;
> int i, ret;
>
> - ret = adis16136_get_freq(adis16136, &freq);
> + mutex_lock(slock);
> + ret = __adis16136_get_freq(adis16136, &freq);
> if (ret < 0)
> - return ret;
> + goto out_unlock;
>
> for (i = ARRAY_SIZE(adis16136_3db_divisors) - 1; i >= 1; i--) {
> if (freq / adis16136_3db_divisors[i] >= val)
> break;
> }
>
> - return adis_write_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, i);
> + ret = __adis_write_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, i);
> +out_unlock:
> + mutex_unlock(slock);
> +
> + return ret;
> }
>
> static int adis16136_get_filter(struct iio_dev *indio_dev, int *val)
> {
> struct adis16136 *adis16136 = iio_priv(indio_dev);
> + struct mutex *slock = &adis16136->adis.state_lock;
> unsigned int freq;
> uint16_t val16;
> int ret;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(slock);
>
> - ret = adis_read_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT, &val16);
> + ret = __adis_read_reg_16(&adis16136->adis, ADIS16136_REG_AVG_CNT,
> + &val16);
> if (ret < 0)
> goto err_unlock;
>
> - ret = adis16136_get_freq(adis16136, &freq);
> + ret = __adis16136_get_freq(adis16136, &freq);
> if (ret < 0)
> goto err_unlock;
>
> *val = freq / adis16136_3db_divisors[val16 & 0x07];
>
> err_unlock:
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(slock);
>
> return ret ? ret : IIO_VAL_INT;
> }
next prev parent reply other threads:[~2019-10-06 9:22 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 [this message]
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
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=20191006102244.719d3941@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 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).