[PATCH 28/35] iio: imu: bmi160: use default_trigger
From: Jonathan Cameron
Date: Sun Nov 15 2026 - 20:51:20 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 particular driver doesn't have that leak
due to the specific ordering of calls. Hence this is just making
things less fragile and enabling further rework on top.
The copy of the trigger pointer in data->trig is only used during
probe(), so replace it with a local variable.
Signed-off-by: Jonathan Cameron <jonathan.cameron@xxxxxxxxxxxxxxxx>
---
drivers/iio/imu/bmi160/bmi160.h | 1 -
drivers/iio/imu/bmi160/bmi160_core.c | 22 +++++++++++-----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/imu/bmi160/bmi160.h b/drivers/iio/imu/bmi160/bmi160.h
index 629844c34f1a..1c4ce2e07b68 100644
--- a/drivers/iio/imu/bmi160/bmi160.h
+++ b/drivers/iio/imu/bmi160/bmi160.h
@@ -7,7 +7,6 @@
struct bmi160_data {
struct regmap *regmap;
- struct iio_trigger *trig;
struct regulator_bulk_data supplies[2];
struct iio_mount_matrix orientation;
};
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index a27efa42e682..50007725f4cc 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -778,31 +778,31 @@ static const struct iio_trigger_ops bmi160_trigger_ops = {
int bmi160_probe_trigger(struct iio_dev *indio_dev, int irq, u32 irq_type)
{
struct bmi160_data *data = iio_priv(indio_dev);
+ struct iio_trigger *trig;
int ret;
- data->trig = devm_iio_trigger_alloc(&indio_dev->dev, "%s-dev%d",
- indio_dev->name,
- iio_device_id(indio_dev));
-
- if (data->trig == NULL)
+ trig = devm_iio_trigger_alloc(&indio_dev->dev, "%s-dev%d",
+ indio_dev->name,
+ iio_device_id(indio_dev));
+ if (!trig)
return -ENOMEM;
ret = devm_request_irq(&indio_dev->dev, irq,
&iio_trigger_generic_data_rdy_poll,
irq_type | IRQF_NO_THREAD,
- "bmi160", data->trig);
+ "bmi160", trig);
if (ret)
return ret;
- data->trig->dev.parent = regmap_get_device(data->regmap);
- data->trig->ops = &bmi160_trigger_ops;
- iio_trigger_set_drvdata(data->trig, indio_dev);
+ trig->dev.parent = regmap_get_device(data->regmap);
+ trig->ops = &bmi160_trigger_ops;
+ iio_trigger_set_drvdata(trig, indio_dev);
- ret = devm_iio_trigger_register(&indio_dev->dev, data->trig);
+ ret = devm_iio_trigger_register(&indio_dev->dev, trig);
if (ret)
return ret;
- indio_dev->trig = iio_trigger_get(data->trig);
+ indio_dev->default_trigger = trig;
return 0;
}
--
2.56.1