From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537AbcFKQHo (ORCPT ); Sat, 11 Jun 2016 12:07:44 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:52158 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbcFKQHn (ORCPT ); Sat, 11 Jun 2016 12:07:43 -0400 Subject: Re: [PATCH] iio: light: tcs3414: use iio helper function to guarantee direct mode To: Peter Meerwald-Stadler , Alison Schofield References: <20160607050913.GA26916@d830.WORKGROUP> <25540d4e-4803-f1be-7dcc-086eb7708233@kernel.org> Cc: knaack.h@gmx.de, lars@metafoo.de, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org From: Jonathan Cameron Message-ID: <26a354c9-094d-c164-747b-71baf11eea81@kernel.org> Date: Sat, 11 Jun 2016 17:07:41 +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: <25540d4e-4803-f1be-7dcc-086eb7708233@kernel.org> 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 16:56, 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. >> >> Acked-by: Peter Meerwald-Stadler > Applied, thanks. Backed out - see the tcs3472 comment. This lock isn't there to protect against mode changes... > > Joanthan >> >>> Signed-off-by: Alison Schofield >>> Cc: Daniel Baluta >>> --- >>> drivers/iio/light/tcs3414.c | 12 +++++------- >>> 1 file changed, 5 insertions(+), 7 deletions(-) >>> >>> diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c >>> index f90f8c5..8a15fb5 100644 >>> --- a/drivers/iio/light/tcs3414.c >>> +++ b/drivers/iio/light/tcs3414.c >>> @@ -53,7 +53,6 @@ >>> >>> struct tcs3414_data { >>> struct i2c_client *client; >>> - struct mutex lock; >>> u8 control; >>> u8 gain; >>> u8 timing; >>> @@ -134,16 +133,16 @@ static int tcs3414_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 = tcs3414_req_data(data); >>> if (ret < 0) { >>> - mutex_unlock(&data->lock); >>> + iio_device_release_direct_mode(indio_dev); >>> return ret; >>> } >>> ret = i2c_smbus_read_word_data(data->client, chan->address); >>> - mutex_unlock(&data->lock); >>> + iio_device_release_direct_mode(indio_dev); >>> if (ret < 0) >>> return ret; >>> *val = ret; >>> @@ -288,7 +287,6 @@ static int tcs3414_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 = &tcs3414_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 >