[PATCH 07/35] iio: adc: ad7779: use default_trigger
From: Jonathan Cameron
Date: Sun Nov 15 2026 - 20:50:27 EST
From: Jonathan Cameron <jonathan.cameron@xxxxxxxxxxxxxxxx>
Set indio_dev->default_trigger rather than taking a reference to the
trigger in probe(). The IIO core now takes the reference during
iio_device_register(), so it is not leaked if probe() fails after
the trigger is set up. This avoid fragile ordering constraints.
The copy of the trigger pointer in st->trig is only used during
probe(), so replace it with a local variable.
Fixes: c9a3f8c7bfcb ("drivers: iio: adc: add support for ad777x family")
Signed-off-by: Jonathan Cameron <jonathan.cameron@xxxxxxxxxxxxxxxx>
---
drivers/iio/adc/ad7779.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/iio/adc/ad7779.c b/drivers/iio/adc/ad7779.c
index 79fb38d0f400..53e4a9a19b60 100644
--- a/drivers/iio/adc/ad7779.c
+++ b/drivers/iio/adc/ad7779.c
@@ -141,7 +141,6 @@ struct ad7779_state {
struct spi_device *spi;
const struct ad7779_chip_info *chip_info;
struct clk *mclk;
- struct iio_trigger *trig;
unsigned int sampling_freq;
enum ad7779_filter filter_enabled;
struct iio_backend *back;
@@ -821,33 +820,34 @@ static int ad7779_setup_channels(struct iio_dev *indio_dev, const struct ad7779_
static int ad7779_setup_without_backend(struct ad7779_state *st, struct iio_dev *indio_dev)
{
- int ret;
struct device *dev = &st->spi->dev;
+ struct iio_trigger *trig;
+ int ret;
indio_dev->info = &ad7779_info;
indio_dev->channels = st->chip_info->channels;
indio_dev->num_channels = ARRAY_SIZE(ad7779_channels);
- st->trig = devm_iio_trigger_alloc(dev, "%s-dev%d", indio_dev->name,
- iio_device_id(indio_dev));
- if (!st->trig)
+ trig = devm_iio_trigger_alloc(dev, "%s-dev%d", indio_dev->name,
+ iio_device_id(indio_dev));
+ if (!trig)
return -ENOMEM;
- st->trig->ops = &ad7779_trigger_ops;
+ trig->ops = &ad7779_trigger_ops;
- iio_trigger_set_drvdata(st->trig, st);
+ iio_trigger_set_drvdata(trig, st);
ret = devm_request_irq(dev, st->spi->irq, iio_trigger_generic_data_rdy_poll,
IRQF_NO_THREAD | IRQF_NO_AUTOEN, indio_dev->name,
- st->trig);
+ trig);
if (ret)
return ret;
- ret = devm_iio_trigger_register(dev, st->trig);
+ ret = devm_iio_trigger_register(dev, trig);
if (ret)
return ret;
- indio_dev->trig = iio_trigger_get(st->trig);
+ indio_dev->default_trigger = trig;
ret = devm_iio_triggered_buffer_setup(dev, indio_dev,
&iio_pollfunc_store_time,
--
2.56.1