From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752178AbcFKQRJ (ORCPT ); Sat, 11 Jun 2016 12:17:09 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:52212 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbcFKQRH (ORCPT ); Sat, 11 Jun 2016 12:17:07 -0400 Subject: Re: [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode To: Peter Meerwald-Stadler , Alison Schofield References: <20160607050823.GA26908@d830.WORKGROUP> Cc: knaack.h@gmx.de, lars@metafoo.de, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org From: Jonathan Cameron Message-ID: Date: Sat, 11 Jun 2016 17:17:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/06/16 17:05, Jonathan Cameron wrote: > On 11/06/16 16:57, Jonathan Cameron wrote: >> On 07/06/16 06:23, Peter Meerwald-Stadler wrote: >>> >>>> Replace the code that guarantees the device stays in direct mode >>>> with iio_device_claim_direct_mode() which does same. This allows >>>> removal of an unused lock in the device private global data. >>> >>> nice! >>> Acked-by: Peter Meerwald-Stadler >> Applied and pushed out as testing for the autobuilders to play with it. > Actually hold that - see the tcs3472 response. This lock isn't actually > here to prevent the buffer running at the same time as the raw call... > > Backed out for now. Reapplied... > > Jonathan >> >> Thanks, >> >> Jonathan >>> >>>> Signed-off-by: Alison Schofield >>>> Cc: Daniel Baluta >>>> --- >>>> drivers/iio/light/isl29125.c | 10 ++++------ >>>> 1 file changed, 4 insertions(+), 6 deletions(-) >>>> >>>> diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c >>>> index e2945a2..a6b9d66 100644 >>>> --- a/drivers/iio/light/isl29125.c >>>> +++ b/drivers/iio/light/isl29125.c >>>> @@ -50,7 +50,6 @@ >>>> >>>> struct isl29125_data { >>>> struct i2c_client *client; >>>> - struct mutex lock; >>>> u8 conf1; >>>> u16 buffer[8]; /* 3x 16-bit, padding, 8 bytes timestamp */ >>>> }; >>>> @@ -128,11 +127,11 @@ static int isl29125_read_raw(struct iio_dev *indio_dev, >>>> >>>> switch (mask) { >>>> case IIO_CHAN_INFO_RAW: >>>> - if (iio_buffer_enabled(indio_dev)) >>>> - return -EBUSY; >>>> - mutex_lock(&data->lock); >>>> + ret = iio_device_claim_direct_mode(indio_dev); >>>> + if (ret) >>>> + return ret; >>>> ret = isl29125_read_data(data, chan->scan_index); >>>> - mutex_unlock(&data->lock); >>>> + iio_device_release_direct_mode(indio_dev); >>>> if (ret < 0) >>>> return ret; >>>> *val = ret; >>>> @@ -259,7 +258,6 @@ static int isl29125_probe(struct i2c_client *client, >>>> data = iio_priv(indio_dev); >>>> i2c_set_clientdata(client, indio_dev); >>>> data->client = client; >>>> - mutex_init(&data->lock); >>>> >>>> indio_dev->dev.parent = &client->dev; >>>> indio_dev->info = &isl29125_info; >>>> >>> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-iio" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >