[PATCH] iio: light: gp2ap020a00f: use iio helper function to lock direct mode

[PATCH] iio: light: gp2ap020a00f: use iio helper function to lock direct mode

[Alison Schofield]

Replace the code that guarantees the device stays in direct mode
with iio_device_claim_direct_mode() which does same.  Includes a
tiny bit of refactoring (single case -> if) and simplified return
flow.

Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Cc: Daniel Baluta <daniel.baluta@gmail.com>
---
 drivers/iio/light/gp2ap020a00f.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index 6d41086..af73af3 100644
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -1287,22 +1287,14 @@ static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
 	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
 	int err = -EINVAL;
 
-	mutex_lock(&data->lock);
-
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-		if (iio_buffer_enabled(indio_dev)) {
-			err = -EBUSY;
-			goto error_unlock;
-		}
+	if (mask == IIO_CHAN_INFO_RAW) {
+		err = iio_device_claim_direct_mode(indio_dev);
+		if (err)
+			return err;
 
 		err = gp2ap020a00f_read_channel(data, chan, val);
-		break;
+		iio_device_release_direct_mode(indio_dev);
 	}
-
-error_unlock:
-	mutex_unlock(&data->lock);
-
 	return err < 0 ? err : IIO_VAL_INT;
 }
 
-- 
2.1.4

Re: [PATCH] iio: light: gp2ap020a00f: use iio helper function to lock direct mode

[Jacek Anaszewski]

Hi Alison,

On 06/08/2016 02:19 AM, Alison Schofield wrote:
> Replace the code that guarantees the device stays in direct mode
> with iio_device_claim_direct_mode() which does same.  Includes a
> tiny bit of refactoring (single case -> if) and simplified return
> flow.
>
> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
> Cc: Daniel Baluta <daniel.baluta@gmail.com>
> ---
>   drivers/iio/light/gp2ap020a00f.c | 18 +++++-------------
>   1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
> index 6d41086..af73af3 100644
> --- a/drivers/iio/light/gp2ap020a00f.c
> +++ b/drivers/iio/light/gp2ap020a00f.c
> @@ -1287,22 +1287,14 @@ static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
>   	struct gp2ap020a00f_data *data = iio_priv(indio_dev);
>   	int err = -EINVAL;
>
> -	mutex_lock(&data->lock);
> -
> -	switch (mask) {
> -	case IIO_CHAN_INFO_RAW:
> -		if (iio_buffer_enabled(indio_dev)) {
> -			err = -EBUSY;
> -			goto error_unlock;
> -		}
> +	if (mask == IIO_CHAN_INFO_RAW) {
> +		err = iio_device_claim_direct_mode(indio_dev);
> +		if (err)
> +			return err;
>
>   		err = gp2ap020a00f_read_channel(data, chan, val);
> -		break;
> +		iio_device_release_direct_mode(indio_dev);
>   	}
> -
> -error_unlock:
> -	mutex_unlock(&data->lock);
> -
>   	return err < 0 ? err : IIO_VAL_INT;
>   }
>
>

Nice patch.

Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>

-- 
Best regards,
Jacek Anaszewski

Re: [PATCH] iio: light: gp2ap020a00f: use iio helper function to lock direct mode

[Jonathan Cameron]

On 08/06/16 08:17, Jacek Anaszewski wrote:
> Hi Alison,
> 
> On 06/08/2016 02:19 AM, Alison Schofield wrote:
>> Replace the code that guarantees the device stays in direct mode
>> with iio_device_claim_direct_mode() which does same.  Includes a
>> tiny bit of refactoring (single case -> if) and simplified return
>> flow.
>>
>> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
>> Cc: Daniel Baluta <daniel.baluta@gmail.com>
>> ---
>>   drivers/iio/light/gp2ap020a00f.c | 18 +++++-------------
>>   1 file changed, 5 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
>> index 6d41086..af73af3 100644
>> --- a/drivers/iio/light/gp2ap020a00f.c
>> +++ b/drivers/iio/light/gp2ap020a00f.c
>> @@ -1287,22 +1287,14 @@ static int gp2ap020a00f_read_raw(struct iio_dev *indio_dev,
>>       struct gp2ap020a00f_data *data = iio_priv(indio_dev);
>>       int err = -EINVAL;
>>
>> -    mutex_lock(&data->lock);
>> -
>> -    switch (mask) {
>> -    case IIO_CHAN_INFO_RAW:
>> -        if (iio_buffer_enabled(indio_dev)) {
>> -            err = -EBUSY;
>> -            goto error_unlock;
>> -        }
>> +    if (mask == IIO_CHAN_INFO_RAW) {
>> +        err = iio_device_claim_direct_mode(indio_dev);
>> +        if (err)
>> +            return err;
>>
>>           err = gp2ap020a00f_read_channel(data, chan, val);
>> -        break;
>> +        iio_device_release_direct_mode(indio_dev);
>>       }
>> -
>> -error_unlock:
>> -    mutex_unlock(&data->lock);
>> -
>>       return err < 0 ? err : IIO_VAL_INT;
>>   }
>>
>>
> 
> Nice patch.
> 
> Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Applied to the togreg branch of iio.git - initially pushed out as
testing for the autobuilders to play with it.

I would have slightly preferred the patch to not change the
case to an if (as really a slightly separate cleanup from
the main target of the patch).

Good changes though!

Thanks,

Jonathan
Thanks,

Jonathan
>