linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging: ade7754: Replace mlock with buf_lock and refactor code
@ 2017-03-20  7:39 Gargi Sharma
  2017-03-21 17:24 ` [Outreachy kernel] " Alison Schofield
  2017-03-21 19:45 ` Jonathan Cameron
  0 siblings, 2 replies; 10+ messages in thread
From: Gargi Sharma @ 2017-03-20  7:39 UTC (permalink / raw)
  To: outreachy-kernel
  Cc: linux-iio, lars, Michael.Hennerich, jic23, knaack.h, pmeerw,
	gregkh, Gargi Sharma

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 buf_lock in the devices global data.

As buf_lock already protects operations in ade7754_write_frequency,
there isn't a need to acquire the lock inside ade7754_spi_write_reg_8
when writing to the register.

Signed-off-by: Gargi Sharma <gs051095@gmail.com>
---
 drivers/staging/iio/meter/ade7754.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 024463a..eb03469 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -29,6 +29,15 @@ static int ade7754_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val)
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct ade7754_state *st = iio_priv(indio_dev);
 
+	if (reg_address == ADE7754_WAVMODE) {
+		st->tx[0] = ADE7754_WRITE_REG(reg_address);
+		st->tx[1] = val;
+
+		ret = spi_write(st->us, st->tx, 2);
+
+		return ret;
+	}
+
 	mutex_lock(&st->buf_lock);
 	st->tx[0] = ADE7754_WRITE_REG(reg_address);
 	st->tx[1] = val;
@@ -430,7 +439,7 @@ static ssize_t ade7754_write_frequency(struct device *dev,
 	if (!val)
 		return -EINVAL;
 
-	mutex_lock(&indio_dev->mlock);
+	mutex_lock(&st->buf_lock);
 
 	t = 26000 / val;
 	if (t > 0)
@@ -451,7 +460,7 @@ static ssize_t ade7754_write_frequency(struct device *dev,
 	ret = ade7754_spi_write_reg_8(dev, ADE7754_WAVMODE, reg);
 
 out:
-	mutex_unlock(&indio_dev->mlock);
+	mutex_unlock(&st->buf_lock);
 
 	return ret ? ret : len;
 }
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-03-22 20:19 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-20  7:39 [PATCH] staging: ade7754: Replace mlock with buf_lock and refactor code Gargi Sharma
2017-03-21 17:24 ` [Outreachy kernel] " Alison Schofield
2017-03-21 17:48   ` Gargi Sharma
2017-03-21 18:12     ` Alison Schofield
2017-03-21 18:18       ` Gargi Sharma
2017-03-21 18:54         ` Alison Schofield
2017-03-21 20:12         ` Alison Schofield
2017-03-21 19:45 ` Jonathan Cameron
2017-03-21 19:52   ` Gargi Sharma
2017-03-22 20:19     ` Jonathan Cameron

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).