From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Alison Schofield <amsfield22@gmail.com>
Cc: knaack.h@gmx.de, lars@metafoo.de, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode
Date: Sat, 11 Jun 2016 17:17:03 +0100 [thread overview]
Message-ID: <f39ef8ce-a627-c61a-599a-6183664f618c@kernel.org> (raw)
In-Reply-To: <fbc33957-2e7e-eac5-eaf7-b089d9c83163@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 <pmeerw@pmeerw.net>
>> 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 <amsfield22@gmail.com>
>>>> Cc: Daniel Baluta <daniel.baluta@gmail.com>
>>>> ---
>>>> 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
>
prev parent reply other threads:[~2016-06-11 16:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 5:08 [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode Alison Schofield
2016-06-07 5:23 ` Peter Meerwald-Stadler
2016-06-11 15:57 ` Jonathan Cameron
2016-06-11 16:05 ` Jonathan Cameron
2016-06-11 16:17 ` Jonathan Cameron [this message]
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=f39ef8ce-a627-c61a-599a-6183664f618c@kernel.org \
--to=jic23@kernel.org \
--cc=amsfield22@gmail.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).