summaryrefslogtreecommitdiffstats
path: root/drivers/iio/industrialio-triggered-event.c
diff options
context:
space:
mode:
authorJonathan Cameron <Jonathan.Cameron@huawei.com>2021-04-26 19:49:03 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2021-05-17 14:49:13 +0200
commit15ea2878bfb255099092634d28f31177f237ccd7 (patch)
tree5dad7386052e103370ac33add69795274c362fb9 /drivers/iio/industrialio-triggered-event.c
parentiio: common: scmi_sensors: Drop duplicate setting of iio_dev.dev.parent (diff)
downloadlinux-15ea2878bfb255099092634d28f31177f237ccd7.tar.xz
linux-15ea2878bfb255099092634d28f31177f237ccd7.zip
iio: core: move @id from struct iio_dev to struct iio_dev_opaque
Continuing from Alexandru Ardelean's introduction of the split between driver modifiable fields and those that should only be set by the core. This could have been done in two steps to make the actual move after introducing iio_device_id() but there seemed limited point to that given how mechanical the majority of the patch is. Includes fixup from Alex for missing mxs-lradc-adc conversion. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com> Link: https://lore.kernel.org/r/20210426174911.397061-2-jic23@kernel.org
Diffstat (limited to 'drivers/iio/industrialio-triggered-event.c')
-rw-r--r--drivers/iio/industrialio-triggered-event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-triggered-event.c b/drivers/iio/industrialio-triggered-event.c
index 53da9ab17a62..4bedc65c9fe3 100644
--- a/drivers/iio/industrialio-triggered-event.c
+++ b/drivers/iio/industrialio-triggered-event.c
@@ -37,7 +37,7 @@ int iio_triggered_event_setup(struct iio_dev *indio_dev,
indio_dev,
"%s_consumer%d",
indio_dev->name,
- indio_dev->id);
+ iio_device_id(indio_dev));
if (indio_dev->pollfunc_event == NULL)
return -ENOMEM;