From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Nuno Sa <Nuno.Sa@analog.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH v3 07/14] iio: adc: max1027: Simplify the _set_trigger_state() helper
Date: Wed, 15 Sep 2021 17:51:10 +0200 [thread overview]
Message-ID: <20210915155117.475962-8-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20210915155117.475962-1-miquel.raynal@bootlin.com>
The call to max1027_enable_trigger() is the same in both cases thanks to
the 'state' variable, so factorize a little bit to simplify the code and
explain why we call this helper.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/iio/adc/max1027.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index d1a9ffa68c38..b7cc77c2c01d 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -409,11 +409,17 @@ static int max1027_set_cnvst_trigger_state(struct iio_trigger *trig, bool state)
struct max1027_state *st = iio_priv(indio_dev);
int ret;
+ /*
+ * In order to disable the convst trigger, start acquisition on
+ * conversion register write, which basically disables triggering
+ * conversions upon cnvst changes and thus has the effect of disabling
+ * the external hardware trigger.
+ */
+ ret = max1027_enable_trigger(indio_dev, state);
+ if (ret)
+ return ret;
+
if (state) {
- ret = max1027_enable_trigger(indio_dev, state);
- if (ret)
- return ret;
-
/*
* Scan from chan 0 to the highest requested channel.
* Include temperature on demand.
@@ -426,11 +432,6 @@ static int max1027_set_cnvst_trigger_state(struct iio_trigger *trig, bool state)
ret = spi_write(st->spi, &st->reg, 1);
if (ret < 0)
return ret;
- } else {
- /* Start acquisition on conversion register write */
- ret = max1027_enable_trigger(indio_dev, state);
- if (ret)
- return ret;
}
return 0;
--
2.27.0
next prev parent reply other threads:[~2021-09-15 15:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 15:51 [PATCH v3 00/14] Bring external triggers support to MAX1027-like ADCs Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 01/14] iio: adc: max1027: Fix style Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 02/14] iio: adc: max1027: Drop extra warning message Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 03/14] iio: adc: max1027: Drop useless debug messages Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 04/14] iio: adc: max1027: Minimize the number of converted channels Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 05/14] iio: adc: max1027: Rename a helper Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 06/14] iio: adc: max1027: Create a helper to enable/disable the cnvst trigger Miquel Raynal
2021-09-15 15:51 ` Miquel Raynal [this message]
2021-09-15 15:51 ` [PATCH v3 08/14] iio: adc: max1027: Ensure a default cnvst trigger configuration Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 09/14] iio: adc: max1027: Create a helper to configure the channels to scan Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 10/14] iio: adc: max1027: Prevent single channel accesses during buffer reads Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 11/14] iio: adc: max1027: Separate the IRQ handler from the read logic Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 12/14] iio: adc: max1027: Introduce an end of conversion helper Miquel Raynal
2021-09-15 15:51 ` [PATCH v3 13/14] iio: adc: max1027: Deeply rework interrupt handling Miquel Raynal
2021-09-18 17:09 ` Jonathan Cameron
2021-09-15 15:51 ` [PATCH v3 14/14] iio: adc: max1027: Don't reject external triggers when there is no IRQ Miquel Raynal
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=20210915155117.475962-8-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=Nuno.Sa@analog.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/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