Linux IIO development
 help / color / mirror / Atom feed
From: Fernando Yang <hagisf@usp.br>
To: hagisf@usp.br, linux-iio@vger.kernel.org
Cc: Michael.Hennerich@analog.com, jic23@kernel.org, lars@metafoo.de
Subject: [PATCH v2 2/3] iio: adc: ad7266: Use iio_device_claim_direct_scoped()
Date: Mon,  3 Jun 2024 15:07:56 -0300	[thread overview]
Message-ID: <20240603180757.8560-2-hagisf@usp.br> (raw)
In-Reply-To: <20240603180757.8560-1-hagisf@usp.br>

Switching to the _scoped() version can make the error handling more
natural instead of delayed until direct mode was released.

Signed-off-by: Fernando Yang <hagisf@usp.br>
---
 drivers/iio/adc/ad7266.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 13ea8a107..356c2fe07 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -151,20 +151,19 @@ static int ad7266_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 = ad7266_read_single(st, val, chan->address);
-		iio_device_release_direct_mode(indio_dev);
-
-		if (ret < 0)
-			return ret;
-		*val = (*val >> 2) & 0xfff;
-		if (chan->scan_type.sign == 's')
-			*val = sign_extend32(*val,
-					     chan->scan_type.realbits - 1);
-
-		return IIO_VAL_INT;
+		iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {
+			ret = ad7266_read_single(st, val, chan->address);
+			
+			if (ret < 0)
+				return ret;
+			*val = (*val >> 2) & 0xfff;
+			if (chan->scan_type.sign == 's')
+				*val = sign_extend32(*val,
+							 chan->scan_type.realbits - 1);
+
+			return IIO_VAL_INT;
+		}
+		unreachable();
 	case IIO_CHAN_INFO_SCALE:
 		scale_mv = st->vref_mv;
 		if (st->mode == AD7266_MODE_DIFF)
-- 
2.34.1


  reply	other threads:[~2024-06-03 18:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-08 15:54 [PATCH] iio: adc: adc7266: Use iio_device_claim_direct_scoped() Fernando Yang
2024-05-11  4:16 ` Marcelo Schmitt
2024-05-11 13:30 ` Jonathan Cameron
2024-06-03 18:07 ` [PATCH v2 1/3] iio: adc: ad7266: Fix variable checking bug Fernando Yang
2024-06-03 18:07   ` Fernando Yang [this message]
2024-06-08  5:21     ` [PATCH v2 2/3] iio: adc: ad7266: Use iio_device_claim_direct_scoped() Marcelo Schmitt
2024-06-03 18:07   ` [PATCH v2 3/3] iio: adc: ad7266: Fix codestyle error Fernando Yang
2024-06-08  5:29     ` Marcelo Schmitt
2024-06-08  5:06   ` [PATCH v2 1/3] iio: adc: ad7266: Fix variable checking bug Marcelo Schmitt
2024-06-08 14:11     ` Jonathan Cameron
2024-06-08 14:41   ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240603180757.8560-2-hagisf@usp.br \
    --to=hagisf@usp.br \
    --cc=Michael.Hennerich@analog.com \
    --cc=jic23@kernel.org \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox