* [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode
@ 2016-06-07 5:08 Alison Schofield
2016-06-07 5:23 ` Peter Meerwald-Stadler
0 siblings, 1 reply; 5+ messages in thread
From: Alison Schofield @ 2016-06-07 5:08 UTC (permalink / raw)
To: jic23; +Cc: pmeerw, knaack.h, lars, linux-iio, linux-kernel
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.
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;
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode
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
0 siblings, 1 reply; 5+ messages in thread
From: Peter Meerwald-Stadler @ 2016-06-07 5:23 UTC (permalink / raw)
To: Alison Schofield; +Cc: jic23, knaack.h, lars, linux-iio, linux-kernel
> 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>
> 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;
>
--
Peter Meerwald-Stadler
+43-664-2444418 (mobile)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode
2016-06-07 5:23 ` Peter Meerwald-Stadler
@ 2016-06-11 15:57 ` Jonathan Cameron
2016-06-11 16:05 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Cameron @ 2016-06-11 15:57 UTC (permalink / raw)
To: Peter Meerwald-Stadler, Alison Schofield
Cc: knaack.h, lars, linux-iio, linux-kernel
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.
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;
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode
2016-06-11 15:57 ` Jonathan Cameron
@ 2016-06-11 16:05 ` Jonathan Cameron
2016-06-11 16:17 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Cameron @ 2016-06-11 16:05 UTC (permalink / raw)
To: Peter Meerwald-Stadler, Alison Schofield
Cc: knaack.h, lars, linux-iio, linux-kernel
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.
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iio: light: isl29125: use iio helper function to guarantee direct mode
2016-06-11 16:05 ` Jonathan Cameron
@ 2016-06-11 16:17 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2016-06-11 16:17 UTC (permalink / raw)
To: Peter Meerwald-Stadler, Alison Schofield
Cc: knaack.h, lars, linux-iio, linux-kernel
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-06-11 16:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).