Re: [PATCH 7/7] iio: adc: ad799x: use iio helper function to guarantee direct mode

From	Jonathan Cameron <jic23@kernel.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 7/7] iio: adc: ad799x: use iio helper function to guarantee direct mode
Date	2016-05-29 20:40 +0200
Message-ID	<rEdMZ-1qk-9@gated-at.bofh.it> (permalink)
References	<rCq1X-7jq-3@gated-at.bofh.it> <rCqbE-7np-21@gated-at.bofh.it> <rCExY-8n2-21@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On 25/05/16 11:42, Daniel Baluta wrote:
> On Tue, May 24, 2016 at 10:20 PM, Alison Schofield <amsfield22@gmail.com> wrote:
>> Replace the code that guarantees the device stays in direct mode
>> with iio_device_claim_direct_mode() which does same.
>>
>> Signed-off-by: Alison Schofield <amsfield22@gmail.com>
>> Cc: Daniel Baluta <daniel.baluta@gmail.com>
> 
> Acked-by: Daniel Baluta <daniel.baluta@gmail.com>
Applied to the togreg branch of iio.git - initially pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan
> 
> 
>> ---
>>  drivers/iio/adc/ad799x.c | 24 +++++++++---------------
>>  1 file changed, 9 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
>> index a3f5254..ec0200d 100644
>> --- a/drivers/iio/adc/ad799x.c
>> +++ b/drivers/iio/adc/ad799x.c
>> @@ -282,12 +282,11 @@ static int ad799x_read_raw(struct iio_dev *indio_dev,
>>
>>         switch (m) {
>>         case IIO_CHAN_INFO_RAW:
>> -               mutex_lock(&indio_dev->mlock);
>> -               if (iio_buffer_enabled(indio_dev))
>> -                       ret = -EBUSY;
>> -               else
>> -                       ret = ad799x_scan_direct(st, chan->scan_index);
>> -               mutex_unlock(&indio_dev->mlock);
>> +               ret = iio_device_claim_direct_mode(indio_dev);
>> +               if (ret)
>> +                       return ret;
>> +               ret = ad799x_scan_direct(st, chan->scan_index);
>> +               iio_device_release_direct_mode(indio_dev);
>>
>>                 if (ret < 0)
>>                         return ret;
>> @@ -395,11 +394,9 @@ static int ad799x_write_event_config(struct iio_dev *indio_dev,
>>         struct ad799x_state *st = iio_priv(indio_dev);
>>         int ret;
>>
>> -       mutex_lock(&indio_dev->mlock);
>> -       if (iio_buffer_enabled(indio_dev)) {
>> -               ret = -EBUSY;
>> -               goto done;
>> -       }
>> +       ret = iio_device_claim_direct_mode(indio_dev);
>> +       if (ret)
>> +               return ret;
>>
>>         if (state)
>>                 st->config |= BIT(chan->scan_index) << AD799X_CHANNEL_SHIFT;
>> @@ -412,10 +409,7 @@ static int ad799x_write_event_config(struct iio_dev *indio_dev,
>>                 st->config &= ~AD7998_ALERT_EN;
>>
>>         ret = ad799x_write_config(st, st->config);
>> -
>> -done:
>> -       mutex_unlock(&indio_dev->mlock);
>> -
>> +       iio_device_release_direct_mode(indio_dev);
>>         return ret;
>>  }
>>
>> --
> --
> 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
>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] iio: adc: clean up claims on direct mode in ad7* drivers Alison Schofield <amsfield22@gmail.com> - 2016-05-24 21:20 +0200
  [PATCH 4/7] iio: adc: ad7476: use iio helper function to guarantee  direct mode Alison Schofield <amsfield22@gmail.com> - 2016-05-24 21:20 +0200
    Re: [PATCH 4/7] iio: adc: ad7476: use iio helper function to  guarantee direct mode Daniel Baluta <daniel.baluta@gmail.com> - 2016-05-25 12:40 +0200
      Re: [PATCH 4/7] iio: adc: ad7476: use iio helper function to  guarantee direct mode Jonathan Cameron <jic23@kernel.org> - 2016-05-29 20:40 +0200
  [PATCH 1/7] iio: adc: ad7266: claim direct mode during sensor read Alison Schofield <amsfield22@gmail.com> - 2016-05-24 21:20 +0200
    Re: [PATCH 1/7] iio: adc: ad7266: claim direct mode during sensor read Daniel Baluta <daniel.baluta@gmail.com> - 2016-05-25 12:40 +0200
      Re: [PATCH 1/7] iio: adc: ad7266: claim direct mode during sensor  read Jonathan Cameron <jic23@kernel.org> - 2016-05-29 19:10 +0200
  [PATCH 5/7] iio: adc: ad7887: use iio helper function to guarantee  direct mode Alison Schofield <amsfield22@gmail.com> - 2016-05-24 21:20 +0200
    Re: [PATCH 5/7] iio: adc: ad7887: use iio helper function to  guarantee direct mode Daniel Baluta <daniel.baluta@gmail.com> - 2016-05-25 12:40 +0200
      Re: [PATCH 5/7] iio: adc: ad7887: use iio helper function to  guarantee direct mode Jonathan Cameron <jic23@kernel.org> - 2016-05-29 20:40 +0200
  [PATCH 6/7] iio: adc: ad7923: use iio helper function to guarantee  direct mode Alison Schofield <amsfield22@gmail.com> - 2016-05-24 21:30 +0200
    Re: [PATCH 6/7] iio: adc: ad7923: use iio helper function to  guarantee direct mode Daniel Baluta <daniel.baluta@gmail.com> - 2016-05-25 12:50 +0200
      Re: [PATCH 6/7] iio: adc: ad7923: use iio helper function to  guarantee direct mode Jonathan Cameron <jic23@kernel.org> - 2016-05-29 20:40 +0200
  [PATCH 7/7] iio: adc: ad799x: use iio helper function to guarantee  direct mode Alison Schofield <amsfield22@gmail.com> - 2016-05-24 21:30 +0200
    Re: [PATCH 7/7] iio: adc: ad799x: use iio helper function to  guarantee direct mode Daniel Baluta <daniel.baluta@gmail.com> - 2016-05-25 12:50 +0200
      Re: [PATCH 7/7] iio: adc: ad799x: use iio helper function to  guarantee direct mode Jonathan Cameron <jic23@kernel.org> - 2016-05-29 20:40 +0200

csiph-web