Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935113AbdCLSbf (ORCPT ); Sun, 12 Mar 2017 14:31:35 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36109 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934809AbdCLSbZ (ORCPT ); Sun, 12 Mar 2017 14:31:25 -0400 Date: Sun, 12 Mar 2017 11:31:22 -0700 From: Alison Schofield To: simran singhal Cc: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, Hartmut Knaack , Peter Meerwald-Stadler , Greg Kroah-Hartman , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com Subject: Re: [Outreachy kernel] [PATCH] staging: adis16060_core: Use private driver lock instead of mlock Message-ID: <20170312183121.GA7728@d830.WORKGROUP> References: <20170312131052.GA21816@singhal-Inspiron-5558> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170312131052.GA21816@singhal-Inspiron-5558> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2586 Lines: 71 On Sun, Mar 12, 2017 at 06:40:52PM +0530, simran singhal wrote: > 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: simran singhal This does not compile. alisons > --- > drivers/staging/iio/gyro/adis16060_core.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c > index c9d46e7..90a3a18 100644 > --- a/drivers/staging/iio/gyro/adis16060_core.c > +++ b/drivers/staging/iio/gyro/adis16060_core.c > @@ -29,11 +29,13 @@ > * @us_r: actual spi_device to read back data > * @buf: transmit or receive buffer > * @buf_lock: mutex to protect tx and rx > + * @lock: protect sensor state > **/ > struct adis16060_state { > struct spi_device *us_w; > struct spi_device *us_r; > struct mutex buf_lock; > + struct mutex lock; /* protect sensor state */ > > u8 buf[3] ____cacheline_aligned; > }; > @@ -87,7 +89,7 @@ static int adis16060_read_raw(struct iio_dev *indio_dev, > switch (mask) { > case IIO_CHAN_INFO_RAW: > /* Take the iio_dev status lock */ > - mutex_lock(&indio_dev->mlock); > + mutex_lock(&st->lock); > ret = adis16060_spi_write(indio_dev, chan->address); > if (ret < 0) > goto out_unlock; > @@ -96,7 +98,7 @@ static int adis16060_read_raw(struct iio_dev *indio_dev, > if (ret < 0) > goto out_unlock; > > - mutex_unlock(&indio_dev->mlock); > + mutex_unlock(&st->lock); > *val = tval; > return IIO_VAL_INT; > case IIO_CHAN_INFO_OFFSET: > @@ -112,7 +114,7 @@ static int adis16060_read_raw(struct iio_dev *indio_dev, > return -EINVAL; > > out_unlock: > - mutex_unlock(&indio_dev->mlock); > + mutex_unlock(&st->lock); > return ret; > } > > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170312131052.GA21816%40singhal-Inspiron-5558. > For more options, visit https://groups.google.com/d/optout.