diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-04-26 19:49:03 +0200 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-05-17 14:49:13 +0200 |
| commit | 15ea2878bfb255099092634d28f31177f237ccd7 (patch) | |
| tree | 5dad7386052e103370ac33add69795274c362fb9 /drivers/iio/pressure | |
| parent | iio: common: scmi_sensors: Drop duplicate setting of iio_dev.dev.parent (diff) | |
| download | linux-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/pressure')
| -rw-r--r-- | drivers/iio/pressure/zpa2326.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/pressure/zpa2326.c b/drivers/iio/pressure/zpa2326.c index a93411216aee..89295c90f801 100644 --- a/drivers/iio/pressure/zpa2326.c +++ b/drivers/iio/pressure/zpa2326.c @@ -1408,7 +1408,8 @@ static int zpa2326_init_managed_trigger(struct device *parent, return 0; trigger = devm_iio_trigger_alloc(parent, "%s-dev%d", - indio_dev->name, indio_dev->id); + indio_dev->name, + iio_device_id(indio_dev)); if (!trigger) return -ENOMEM; |