From: Himanshi Jain <himshijain.hj@gmail.com>
To: outreachy-kernel@googlegroups.com, jic23@kernel.org,
knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
linux-iio@vger.kernel.org, daniel.baluta@gmail.com,
amsfield22@gmail.com, Michael.Hennerich@analog.com,
gregkh@linuxfoundation.org
Subject: [PATCH] staging: iio: ade7753: replace mlock with driver private lock
Date: Mon, 18 Sep 2017 12:29:52 +0530 [thread overview]
Message-ID: <20170918065952.GA5386@himanshi-Inspiron-5558> (raw)
Replace driver usage of mlock with driver private lock to meet the new
model where usage of iio_dev->mlock is being redefined as protecting
operating mode changes(changes between BUFFER* and DIRECT modes).
Signed-off-by: Himanshi Jain <himshijain.hj@gmail.com>
---
drivers/staging/iio/meter/ade7753.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index ce26abdea..745c5a6 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -81,10 +81,12 @@
* @tx: transmit buffer
* @rx: receive buffer
* @buf_lock: mutex to protect tx and rx
+ * @lock: protect sensor data
**/
struct ade7753_state {
struct spi_device *us;
struct mutex buf_lock;
+ struct mutex lock; /* protect sensor data */
u8 tx[ADE7753_MAX_TX] ____cacheline_aligned;
u8 rx[ADE7753_MAX_RX];
};
@@ -483,7 +485,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)
@@ -504,7 +506,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;
}
@@ -580,6 +582,7 @@ static int ade7753_probe(struct spi_device *spi)
st = iio_priv(indio_dev);
st->us = spi;
mutex_init(&st->buf_lock);
+ mutex_init(&st->lock);
indio_dev->name = spi->dev.driver->name;
indio_dev->dev.parent = &spi->dev;
--
1.9.1
next reply other threads:[~2017-09-18 7:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-18 6:59 Himanshi Jain [this message]
2017-09-18 10:06 ` [PATCH] staging: iio: ade7753: replace mlock with driver private lock Greg KH
2017-09-24 14:17 ` Jonathan Cameron
2017-09-27 14:57 ` Himanshi Jain
2017-09-30 20:17 ` Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2017-03-12 13:32 simran singhal
2017-03-13 12:00 ` Lars-Peter Clausen
2017-03-13 12:33 ` SIMRAN SINGHAL
2017-03-13 13:34 ` Lars-Peter Clausen
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=20170918065952.GA5386@himanshi-Inspiron-5558 \
--to=himshijain.hj@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=amsfield22@gmail.com \
--cc=daniel.baluta@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=outreachy-kernel@googlegroups.com \
--cc=pmeerw@pmeerw.net \
/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