Skip to contentSkip to conversation

staging: ad7759: Replace mlock with driver private lock

PATCH Superseded Arushi Singhal 2 participants 2 messages Mar 20, 2017 – Mar 22, 2017

Subsystems (4)
Staging IIO Analog Devices IIO drivers Staging - industrial io

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Arushi Singhal

author
#0 lore raw

PATCH 1/1 staging: ad7759: Replace mlock with driver private lock

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.

Signed-off-by Arushi Singhal <[email protected]>
---
 drivers/staging/iio/meter/ade7759.c | 4 ++--
 drivers/staging/iio/meter/ade7759.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/staging/iio/meter/ade7759.c +2 -2
index 944ee3401029..1d1e0b33021f 100644
@@ -381,7 +381,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,
 	if (!val)
 		return -EINVAL;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->buf_lock);
 
 	t = 27900 / val;
 	if (t > 0)

@@ -402,7 +402,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,
 	ret = ade7759_spi_write_reg_16(dev, ADE7759_MODE, reg);
 
 out:
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->buf_lock);
 
 	return ret ? ret : len;
 }
drivers/staging/iio/meter/ade7759.h +1 -0
index f0716d2fdf8e..4f69bb93cc45 100644
@@ -42,6 +42,7 @@
  * @buf_lock:		mutex to protect tx and rx
  * @tx:			transmit buffer
  * @rx:			receive buffer
+ * @lock		protect sensor state
  **/
 struct ade7759_state {
 	struct spi_device	*us;
Signature · 1 line
2.11.0
maintainer
#1 lore raw

drivers/staging/iio/meter/ade7759.c static ssize_t ade7759_write_frequency(struct device *dev,

Quoted 27 lines · Arushi Singhal

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.

Signed-off-by Arushi Singhal <[email protected]>
---
 drivers/staging/iio/meter/ade7759.c | 4 ++--
 drivers/staging/iio/meter/ade7759.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/staging/iio/meter/ade7759.c +1 -1
index 944ee3401029..1d1e0b33021f 100644
@@ -381,7 +381,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,
 	if (!val)
 		return -EINVAL;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->buf_lock);
 
 	t = 27900 / val;
 	if (t > 0)

@@ -402,7 +402,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,

Deadlock as this call also take the buf_lock mutex..

Quoted 13 lines
drivers/staging/iio/meter/ade7759.c +1 -1
 	ret = ade7759_spi_write_reg_16(dev, ADE7759_MODE, reg);
 
 out:
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->buf_lock);
 
 	return ret ? ret : len;
 }
drivers/staging/iio/meter/ade7759.h +0 -0
index f0716d2fdf8e..4f69bb93cc45 100644

drivers/staging/iio/meter/ade7759.h line 45

Quoted 4 lines
drivers/staging/iio/meter/ade7759.h +1 -0
@@ -42,6 +42,7 @@
  * @buf_lock:		mutex to protect tx and rx
  * @tx:			transmit buffer
  * @rx:			receive buffer
+ * @lock		protect sensor state

?

Quoted 4 lines
drivers/staging/iio/meter/ade7759.h +0 -0
  **/
 struct ade7759_state {
 	struct spi_device	*us;