iio: core: Copy iio_info.attrs->is_visible into iio_dev_opaque.chan_attr_group.is_visible
The iio-core extends the attr_group provided by the driver with its own attributes. To be able to do this it: 1. Has its own (non const) io_dev_opaque.chan_attr_group attr_group struct 2. It allocates a new attrs array with room for both the drivers and its own attributes 3. It copies over the driver provided attributes into the newly allocated attrs array. But the drivers attr_group may contain more then just the attrs array, it may also contain an is_visible callback and at least the adi-axi-adc.c is currently defining such a callback. Change the attr_group copying code to also copy over the is_visible callback, so that drivers can define one and have it workins as is normal for attr_group-s all over the kernel. Note that the is_visible callback takes an index into the array as argument, so that indices of the driver's attributes must not change, this is not a problem as the driver's own attributes are added first to the newly allocated attrs array and the attributes handled by the core are appended after the driver's attributes. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Cc: Michael Hennerich <michael.hennerich@analog.com> Link: https://lore.kernel.org/r/20201125084606.11404-2-hdegoede@redhat.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Родитель
2a9685d1a3
Коммит
18b4c9cd96
|
@ -1473,11 +1473,14 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
|
|||
goto error_clear_attrs;
|
||||
}
|
||||
/* Copy across original attributes */
|
||||
if (indio_dev->info->attrs)
|
||||
if (indio_dev->info->attrs) {
|
||||
memcpy(iio_dev_opaque->chan_attr_group.attrs,
|
||||
indio_dev->info->attrs->attrs,
|
||||
sizeof(iio_dev_opaque->chan_attr_group.attrs[0])
|
||||
*attrcount_orig);
|
||||
iio_dev_opaque->chan_attr_group.is_visible =
|
||||
indio_dev->info->attrs->is_visible;
|
||||
}
|
||||
attrn = attrcount_orig;
|
||||
/* Add all elements from the list. */
|
||||
list_for_each_entry(p, &iio_dev_opaque->channel_attr_list, l)
|
||||
|
|
Загрузка…
Ссылка в новой задаче