* [PATCH] iio: proximity: sx9500: claim direct mode during raw proximity reads
@ 2017-01-20 22:11 Alison Schofield
2017-01-21 8:49 ` Vlad Dogaru
0 siblings, 1 reply; 3+ messages in thread
From: Alison Schofield @ 2017-01-20 22:11 UTC (permalink / raw)
To: jic23; +Cc: ddvlad, knaack.h, lars, pmeerw, linux-iio, linux-kernel
Driver was checking for direct mode but not locking it. Use the
claim/release helper functions to guarantee the device stays in
direct mode during raw reads of proximity data.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/iio/proximity/sx9500.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
index 1f06282..9ea147f 100644
--- a/drivers/iio/proximity/sx9500.c
+++ b/drivers/iio/proximity/sx9500.c
@@ -387,14 +387,18 @@ static int sx9500_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long mask)
{
struct sx9500_data *data = iio_priv(indio_dev);
+ int ret;
switch (chan->type) {
case IIO_PROXIMITY:
switch (mask) {
case IIO_CHAN_INFO_RAW:
- if (iio_buffer_enabled(indio_dev))
- return -EBUSY;
- return sx9500_read_proximity(data, chan, val);
+ ret = iio_device_claim_direct_mode(indio_dev);
+ if (ret)
+ return ret;
+ ret = sx9500_read_proximity(data, chan, val);
+ iio_device_release_direct_mode(indio_dev);
+ return ret;
case IIO_CHAN_INFO_SAMP_FREQ:
return sx9500_read_samp_freq(data, val, val2);
default:
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] iio: proximity: sx9500: claim direct mode during raw proximity reads
2017-01-20 22:11 [PATCH] iio: proximity: sx9500: claim direct mode during raw proximity reads Alison Schofield
@ 2017-01-21 8:49 ` Vlad Dogaru
2017-01-21 12:22 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Vlad Dogaru @ 2017-01-21 8:49 UTC (permalink / raw)
To: Alison Schofield
Cc: Jonathan Cameron, Hartmut Knaack, lars, pmeerw, linux-iio, linux-kernel
On Fri, Jan 20, 2017 at 11:11 PM, Alison Schofield <amsfield22@gmail.com> wrote:
> Driver was checking for direct mode but not locking it. Use the
> claim/release helper functions to guarantee the device stays in
> direct mode during raw reads of proximity data.
>
> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Reviewed-by: Vlad Dogaru <ddvlad@gmail.com>
> ---
> drivers/iio/proximity/sx9500.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
> index 1f06282..9ea147f 100644
> --- a/drivers/iio/proximity/sx9500.c
> +++ b/drivers/iio/proximity/sx9500.c
> @@ -387,14 +387,18 @@ static int sx9500_read_raw(struct iio_dev *indio_dev,
> int *val, int *val2, long mask)
> {
> struct sx9500_data *data = iio_priv(indio_dev);
> + int ret;
>
> switch (chan->type) {
> case IIO_PROXIMITY:
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> - if (iio_buffer_enabled(indio_dev))
> - return -EBUSY;
> - return sx9500_read_proximity(data, chan, val);
> + ret = iio_device_claim_direct_mode(indio_dev);
> + if (ret)
> + return ret;
> + ret = sx9500_read_proximity(data, chan, val);
> + iio_device_release_direct_mode(indio_dev);
> + return ret;
> case IIO_CHAN_INFO_SAMP_FREQ:
> return sx9500_read_samp_freq(data, val, val2);
> default:
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iio: proximity: sx9500: claim direct mode during raw proximity reads
2017-01-21 8:49 ` Vlad Dogaru
@ 2017-01-21 12:22 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2017-01-21 12:22 UTC (permalink / raw)
To: Vlad Dogaru, Alison Schofield
Cc: Hartmut Knaack, lars, pmeerw, linux-iio, linux-kernel
On 21/01/17 08:49, Vlad Dogaru wrote:
> On Fri, Jan 20, 2017 at 11:11 PM, Alison Schofield <amsfield22@gmail.com> wrote:
>> Driver was checking for direct mode but not locking it. Use the
>> claim/release helper functions to guarantee the device stays in
>> direct mode during raw reads of proximity data.
>>
>> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
>
> Reviewed-by: Vlad Dogaru <ddvlad@gmail.com>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.
Thanks,
Jonathan
>
>> ---
>> drivers/iio/proximity/sx9500.c | 10 +++++++---
>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
>> index 1f06282..9ea147f 100644
>> --- a/drivers/iio/proximity/sx9500.c
>> +++ b/drivers/iio/proximity/sx9500.c
>> @@ -387,14 +387,18 @@ static int sx9500_read_raw(struct iio_dev *indio_dev,
>> int *val, int *val2, long mask)
>> {
>> struct sx9500_data *data = iio_priv(indio_dev);
>> + int ret;
>>
>> switch (chan->type) {
>> case IIO_PROXIMITY:
>> switch (mask) {
>> case IIO_CHAN_INFO_RAW:
>> - if (iio_buffer_enabled(indio_dev))
>> - return -EBUSY;
>> - return sx9500_read_proximity(data, chan, val);
>> + ret = iio_device_claim_direct_mode(indio_dev);
>> + if (ret)
>> + return ret;
>> + ret = sx9500_read_proximity(data, chan, val);
>> + iio_device_release_direct_mode(indio_dev);
>> + return ret;
>> case IIO_CHAN_INFO_SAMP_FREQ:
>> return sx9500_read_samp_freq(data, val, val2);
>> default:
>> --
>> 2.1.4
>>
> --
> 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] 3+ messages in thread
end of thread, other threads:[~2017-01-21 12:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-20 22:11 [PATCH] iio: proximity: sx9500: claim direct mode during raw proximity reads Alison Schofield
2017-01-21 8:49 ` Vlad Dogaru
2017-01-21 12:22 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.