[PATCH v4 4/6] iio: adc: ad7625: move initial mode setup
From: Nicolae-Daniel Deaconescu
Date: Thu Nov 19 2026 - 06:25:36 EST
Move the EN pin mode setup from ad7625_probe() into
ad7625_set_initial_mode(). Pick the mode first and check the result of
setting it once, returning its error instead of -EINVAL. A following patch
adds parts without EN pins that skip it.
Signed-off-by: Nicolae-Daniel Deaconescu <Nicolae-daniel.Deaconescu@xxxxxxxxxx>
---
drivers/iio/adc/ad7625.c | 52 ++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 23 deletions(-)
diff --git a/drivers/iio/adc/ad7625.c b/drivers/iio/adc/ad7625.c
index ade2f2368bd8..127441050687 100644
--- a/drivers/iio/adc/ad7625.c
+++ b/drivers/iio/adc/ad7625.c
@@ -561,6 +561,32 @@ static int devm_ad7625_regulator_setup(struct device *dev,
return 0;
}
+static int ad7625_set_initial_mode(struct device *dev, struct ad7625_state *st)
+{
+ enum ad7960_mode mode;
+ int ret;
+
+ /* Set the device mode based on detected EN configuration. */
+ if (!st->info->has_bandwidth_control) {
+ ad7625_set_en_gpios_for_vref(st, st->have_refin, st->vref_mv);
+ return 0;
+ }
+
+ if (st->can_wide_bandwidth)
+ mode = AD7960_MODE_WIDE_BANDWIDTH;
+ else if (st->can_narrow_bandwidth)
+ mode = AD7960_MODE_NARROW_BANDWIDTH;
+ else
+ return dev_err_probe(dev, -EINVAL,
+ "couldn't set device to wide or narrow bandwidth modes\n");
+
+ ret = ad7960_set_mode(st, mode, st->have_refin, st->vref_mv);
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to set EN pins\n");
+
+ return 0;
+}
+
static int ad7625_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -595,29 +621,9 @@ static int ad7625_probe(struct platform_device *pdev)
if (ret)
return ret;
- /* Set the device mode based on detected EN configuration. */
- if (!st->info->has_bandwidth_control) {
- ad7625_set_en_gpios_for_vref(st, st->have_refin, st->vref_mv);
- } else {
- /*
- * If neither sampling mode is available, then report an error,
- * since the other modes are not useful defaults.
- */
- if (st->can_wide_bandwidth) {
- ret = ad7960_set_mode(st, AD7960_MODE_WIDE_BANDWIDTH,
- st->have_refin, st->vref_mv);
- } else if (st->can_narrow_bandwidth) {
- ret = ad7960_set_mode(st, AD7960_MODE_NARROW_BANDWIDTH,
- st->have_refin, st->vref_mv);
- } else {
- return dev_err_probe(dev, -EINVAL,
- "couldn't set device to wide or narrow bandwidth modes\n");
- }
-
- if (ret)
- return dev_err_probe(dev, -EINVAL,
- "failed to set EN pins\n");
- }
+ ret = ad7625_set_initial_mode(dev, st);
+ if (ret)
+ return ret;
ret = devm_ad7625_pwm_get(dev, st);
if (ret)
--
2.56.0