All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <jic23@kernel.org>, <nuno.sa@analog.com>,
	<Michael.Hennerich@analog.com>,
	Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH v2 04/11] iio: imu: adis: create an unlocked version of adis_check_status()
Date: Fri, 22 Nov 2019 15:24:14 +0200	[thread overview]
Message-ID: <20191122132421.5500-5-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20191122132421.5500-1-alexandru.ardelean@analog.com>

This one also gets re-used in certain operations, so it makes sense to
have an unlocked version of this to group it with other
reads/writes/operations to have a single lock for the whole state change.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 drivers/iio/imu/adis.c       |  8 ++++----
 include/linux/iio/imu/adis.h | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/imu/adis.c b/drivers/iio/imu/adis.c
index 5cf7a15be6ee..b63d6e6f5415 100644
--- a/drivers/iio/imu/adis.c
+++ b/drivers/iio/imu/adis.c
@@ -277,18 +277,18 @@ int adis_enable_irq(struct adis *adis, bool enable)
 EXPORT_SYMBOL(adis_enable_irq);
 
 /**
- * adis_check_status() - Check the device for error conditions
+ * __adis_check_status() - Check the device for error conditions (unlocked)
  * @adis: The adis device
  *
  * Returns 0 on success, a negative error code otherwise
  */
-int adis_check_status(struct adis *adis)
+int __adis_check_status(struct adis *adis)
 {
 	uint16_t status;
 	int ret;
 	int i;
 
-	ret = adis_read_reg_16(adis, adis->data->diag_stat_reg, &status);
+	ret = __adis_read_reg_16(adis, adis->data->diag_stat_reg, &status);
 	if (ret)
 		return ret;
 
@@ -306,7 +306,7 @@ int adis_check_status(struct adis *adis)
 
 	return -EIO;
 }
-EXPORT_SYMBOL_GPL(adis_check_status);
+EXPORT_SYMBOL_GPL(__adis_check_status);
 
 /**
  * adis_reset() - Reset the device
diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
index 38ebe41092e1..db759957e1c1 100644
--- a/include/linux/iio/imu/adis.h
+++ b/include/linux/iio/imu/adis.h
@@ -267,7 +267,18 @@ static inline int adis_read_reg_32(struct adis *adis, unsigned int reg,
 }
 
 int adis_enable_irq(struct adis *adis, bool enable);
-int adis_check_status(struct adis *adis);
+int __adis_check_status(struct adis *adis);
+
+static inline int adis_check_status(struct adis *adis)
+{
+	int ret;
+
+	mutex_lock(&adis->state_lock);
+	ret = __adis_check_status(adis);
+	mutex_unlock(&adis->state_lock);
+
+	return ret;
+}
 
 int adis_initial_startup(struct adis *adis);
 
-- 
2.20.1


  parent reply	other threads:[~2019-11-22 13:30 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-22 13:24 [PATCH v2 00/11] iio: imu: adis: cleanup lock usage Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 01/11] iio: imu: adis: rename txrx_lock -> state_lock Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 02/11] iio: imu: adis: add unlocked read/write function versions Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 03/11] iio: imu: adis[16480]: group RW into a single lock in adis_enable_irq() Alexandru Ardelean
2019-11-22 13:24 ` Alexandru Ardelean [this message]
2019-11-22 13:24 ` [PATCH v2 05/11] iio: imu: adis: create an unlocked version of adis_reset() Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 06/11] iio: imu: adis: protect initial startup routine with state lock Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 07/11] iio: imu: adis: group single conversion under a single " Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 08/11] iio: imu: adis16400: rework locks using ADIS library's " Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 09/11] iio: gyro: adis16136: " Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 10/11] iio: imu: adis16480: use state lock for filter freq set Alexandru Ardelean
2019-11-22 13:24 ` [PATCH v2 11/11] iio: gyro: adis16260: replace mlock with ADIS lib's state_lock Alexandru Ardelean
2019-11-23 12:21 ` [PATCH v2 00/11] iio: imu: adis: cleanup lock usage 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=20191122132421.5500-5-alexandru.ardelean@analog.com \
    --to=alexandru.ardelean@analog.com \
    --cc=Michael.Hennerich@analog.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nuno.sa@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.