From: Alexandru Ardelean <aardelean@baylibre.com>
To: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org
Cc: jic23@kernel.org, krzk+dt@kernel.org, robh@kernel.org,
lars@metafoo.de, michael.hennerich@analog.com,
gstols@baylibre.com, Alexandru Ardelean <aardelean@baylibre.com>
Subject: [PATCH 3/7] iio: adc: ad7606: split a 'ad7606_sw_mode_setup()' from probe
Date: Mon, 19 Aug 2024 09:47:13 +0300 [thread overview]
Message-ID: <20240819064721.91494-4-aardelean@baylibre.com> (raw)
In-Reply-To: <20240819064721.91494-1-aardelean@baylibre.com>
This change moves the logic for setting up SW mode (during probe) into it's
own function.
With the addition of some newer parts, the SW-mode part can get a little
more complicated.
So it's a bit better to have a separate function for this.
Signed-off-by: Alexandru Ardelean <aardelean@baylibre.com>
---
drivers/iio/adc/ad7606.c | 43 ++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index 5049e37f8393..b400c9b2519d 100644
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@ -545,6 +545,29 @@ static const struct iio_trigger_ops ad7606_trigger_ops = {
.validate_device = iio_trigger_validate_own_device,
};
+static int ad7606_sw_mode_setup(struct iio_dev *indio_dev)
+{
+ struct ad7606_state *st = iio_priv(indio_dev);
+
+ if (!st->bops->sw_mode_config)
+ return 0;
+
+ st->sw_mode_en = device_property_present(st->dev, "adi,sw-mode");
+ if (!st->sw_mode_en)
+ return 0;
+
+ indio_dev->info = &ad7606_info_os_range_and_debug;
+
+ /* Scale of 0.076293 is only available in sw mode */
+ st->scale_avail = ad7616_sw_scale_avail;
+ st->num_scales = ARRAY_SIZE(ad7616_sw_scale_avail);
+
+ /* After reset, in software mode, ±10 V is set by default */
+ memset32(st->range, 2, ARRAY_SIZE(st->range));
+
+ return st->bops->sw_mode_config(indio_dev);
+}
+
int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
const char *name, unsigned int id,
const struct ad7606_bus_ops *bops)
@@ -617,23 +640,9 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
st->write_scale = ad7606_write_scale_hw;
st->write_os = ad7606_write_os_hw;
- if (st->bops->sw_mode_config)
- st->sw_mode_en = device_property_present(st->dev,
- "adi,sw-mode");
-
- if (st->sw_mode_en) {
- /* Scale of 0.076293 is only available in sw mode */
- st->scale_avail = ad7616_sw_scale_avail;
- st->num_scales = ARRAY_SIZE(ad7616_sw_scale_avail);
-
- /* After reset, in software mode, ±10 V is set by default */
- memset32(st->range, 2, ARRAY_SIZE(st->range));
- indio_dev->info = &ad7606_info_os_range_and_debug;
-
- ret = st->bops->sw_mode_config(indio_dev);
- if (ret < 0)
- return ret;
- }
+ ret = ad7606_sw_mode_setup(indio_dev);
+ if (ret)
+ return ret;
st->trig = devm_iio_trigger_alloc(dev, "%s-dev%d",
indio_dev->name,
--
2.46.0
next prev parent reply other threads:[~2024-08-19 6:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 6:47 [PATCH 0/7] iio: adc: ad7606: add support for AD7606C-{16,18} parts Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 1/7] iio: adc: ad7606: add 'bits' parameter to channels macros Alexandru Ardelean
2024-08-23 18:52 ` Jonathan Cameron
2024-08-27 13:53 ` Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 2/7] iio: adc: ad7606: move 'val' pointer to ad7606_scan_direct() Alexandru Ardelean
2024-08-19 6:47 ` Alexandru Ardelean [this message]
2024-08-19 6:47 ` [PATCH 4/7] iio: adc: ad7606: wrap channel ranges & scales into struct Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 5/7] iio: adc: ad7606: rework available attributes for SW channels Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 6/7] dt-bindings: iio: adc: add adi,ad7606c-{16,18} compatible strings Alexandru Ardelean
2024-08-19 13:09 ` Krzysztof Kozlowski
2024-08-20 4:51 ` Alexandru Ardelean
2024-08-21 20:26 ` Jonathan Cameron
2024-08-23 9:09 ` Krzysztof Kozlowski
2024-08-28 10:23 ` Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 7/7] iio: adc: ad7606: add support for AD7606C-{16,18} parts Alexandru Ardelean
2024-08-19 15:07 ` kernel test robot
2024-08-19 15:33 ` David Lechner
2024-08-23 15:54 ` Alexandru Ardelean
2024-08-23 18:04 ` David Lechner
2024-08-23 19:19 ` Jonathan Cameron
2024-08-27 13:53 ` Alexandru Ardelean
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=20240819064721.91494-4-aardelean@baylibre.com \
--to=aardelean@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=gstols@baylibre.com \
--cc=jic23@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--cc=robh@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