Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1598623

[PATCH] staging: iio: ade7753: replace mlock with driver private lock

Show all headers | View raw

The IIO subsystem is redefining iio_dev->mlock to be used by
the IIO core only for protecting device operating mode changes.
ie. Changes between INDIO_DIRECT_MODE, INDIO_BUFFER_* modes.

In this driver, mlock was being used to protect hardware state
changes.  Replace it with a lock in the devices global data.

Fix some coding style issues related to white space also.

Signed-off-by: simran singhal <singhalsimran0@gmail.com>
---
 drivers/staging/iio/meter/ade7753.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index dfd8b71..ca99d82 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -81,12 +81,14 @@
  * @tx:         transmit buffer
  * @rx:         receive buffer
  * @buf_lock:       mutex to protect tx and rx
+ * @lock:	protect sensor state
  **/
 struct ade7753_state {
-	    struct spi_device   *us;
-		    struct mutex        buf_lock;
-			    u8          tx[ADE7753_MAX_TX] ____cacheline_aligned;
-				    u8          rx[ADE7753_MAX_RX];
+	struct spi_device   *us;
+	struct mutex        buf_lock;
+	struct mutex        lock;	/* protect sensor state */
+	u8          tx[ADE7753_MAX_TX] ____cacheline_aligned;
+	u8          rx[ADE7753_MAX_RX];
 };
 
 static int ade7753_spi_write_reg_8(struct device *dev,
@@ -484,7 +486,7 @@ static ssize_t ade7753_write_frequency(struct device *dev,
 	if (!val)
 		return -EINVAL;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->lock);
 
 	t = 27900 / val;
 	if (t > 0)
@@ -505,7 +507,7 @@ static ssize_t ade7753_write_frequency(struct device *dev,
 	ret = ade7753_spi_write_reg_16(dev, ADE7753_MODE, reg);
 
 out:
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->lock);
 
 	return ret ? ret : len;
 }
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging: iio: ade7753: replace mlock with driver private lock simran singhal <singhalsimran0@gmail.com> - 2017-03-12 14:40 +0100
  Re: [Outreachy kernel] [PATCH] staging: iio: ade7753: replace mlock  with driver private lock Alison Schofield <amsfield22@gmail.com> - 2017-03-12 19:40 +0100
    Re: [Outreachy kernel] [PATCH] staging: iio: ade7753: replace mlock  with driver private lock SIMRAN SINGHAL <singhalsimran0@gmail.com> - 2017-03-13 05:00 +0100
      Re: [Outreachy kernel] [PATCH] staging: iio: ade7753: replace mlock  with driver private lock Alison Schofield <amsfield22@gmail.com> - 2017-03-13 06:40 +0100
  Re: [PATCH] staging: iio: ade7753: replace mlock with driver private  lock Lars-Peter Clausen <lars@metafoo.de> - 2017-03-13 13:10 +0100
    Re: [PATCH] staging: iio: ade7753: replace mlock with driver private lock SIMRAN SINGHAL <singhalsimran0@gmail.com> - 2017-03-13 13:40 +0100
      Re: [PATCH] staging: iio: ade7753: replace mlock with driver private  lock Lars-Peter Clausen <lars@metafoo.de> - 2017-03-13 15:10 +0100

csiph-web