| Message ID | 20240501215724.26655-2-jorge.harrisonn@usp.br (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Use of `claim_direct_scoped` for improved error handling | expand |
On Wed, 1 May 2024 18:57:23 -0300 Jorge Harrisonn <jorge.harrisonn@usp.br> wrote: > Using iio_device_claim_direct_scoped instead of calling `iio_device > _claim_direct_modeand later callingiio_device_release_direct_mode` > > This should make code cleaner and error handling easier > > Co-authored-by: Lais Nuto <laisnuto@usp.br> > Signed-off-by: Lais Nuto <laisnuto@usp.br> > Signed-off-by: Jorge Harrisonn <jorge.harrisonn@usp.br> > --- > drivers/iio/adc/ad7606.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c > index 1928d9ae5bcf..fa989e0d7e70 100644 > --- a/drivers/iio/adc/ad7606.c > +++ b/drivers/iio/adc/ad7606.c > @@ -174,17 +174,14 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, > > switch (m) { > case IIO_CHAN_INFO_RAW: > - ret = iio_device_claim_direct_mode(indio_dev); > - if (ret) > - return ret; > - > - ret = ad7606_scan_direct(indio_dev, chan->address); > - iio_device_release_direct_mode(indio_dev); > - > - if (ret < 0) > - return ret; > - *val = (short)ret; > - return IIO_VAL_INT; > + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { > + ret = ad7606_scan_direct(indio_dev, chan->address); > + if (ret < 0) There is a stray space on the line above after the ) Make sure to run checkpatch.pl which should have caught this > + return ret; > + *val = (short) ret; Not really part of your patch so I'll leave it alone, but that cast seems rather pointless. Applied to the togreg branch of iio.git and pushed out as testing with the white space above fixed. Note I'll be rebasing that tree after the merge window so until then this will only be visible on the testing branch. Thanks, Jonathan > + return IIO_VAL_INT; > + } > + unreachable(); > case IIO_CHAN_INFO_SCALE: > if (st->sw_mode_en) > ch = chan->address;
… > _claim_direct_modeand later callingiio_device_release_direct_mode` > > This should make code cleaner and error handling easier * Please avoid typos in such a change description. * Can imperative wordings be also more desirable here? Regards, Markus
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 1928d9ae5bcf..fa989e0d7e70 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -174,17 +174,14 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, switch (m) { case IIO_CHAN_INFO_RAW: - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - - ret = ad7606_scan_direct(indio_dev, chan->address); - iio_device_release_direct_mode(indio_dev); - - if (ret < 0) - return ret; - *val = (short)ret; - return IIO_VAL_INT; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { + ret = ad7606_scan_direct(indio_dev, chan->address); + if (ret < 0) + return ret; + *val = (short) ret; + return IIO_VAL_INT; + } + unreachable(); case IIO_CHAN_INFO_SCALE: if (st->sw_mode_en) ch = chan->address;