iio: buffer: remove 'scan_el_attrs' attribute group from buffer struct

This field doesn't seem used. It seems that only 'buffer->attrs' was ever
used to extend sysfs attributes for an IIO buffer.

Moving forward, it may not make sense to keep it. This patch removes the
field and it's initialization code.

Since we want to rework IIO buffer, to be able to add more buffers per IIO
device, we will merge [somehow] the 'buffer' & 'scan_elements' groups, and
we will continue to add the attributes to the 'buffer' group.

Removing it here, will also make the rework here a bit smaller, since
this code will not be present.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index e6fa1a4e135dfc24f7f8135f3005ddd4c5a4b598..221157136af6e19ad855b0ae907780917595601a 100644 (file)
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -1283,11 +1283,6 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev)
 
        indio_dev->groups[indio_dev->groupcounter++] = &buffer->buffer_group;
 
-       if (buffer->scan_el_attrs != NULL) {
-               attr = buffer->scan_el_attrs->attrs;
-               while (*attr++ != NULL)
-                       attrcount_orig++;
-       }
        attrcount = attrcount_orig;
        INIT_LIST_HEAD(&buffer->scan_el_dev_attr_list);
        channels = indio_dev->channels;
@@ -1325,9 +1320,6 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev)
                ret = -ENOMEM;
                goto error_free_scan_mask;
        }
-       if (buffer->scan_el_attrs)
-               memcpy(buffer->scan_el_group.attrs, buffer->scan_el_attrs,
-                      sizeof(buffer->scan_el_group.attrs[0])*attrcount_orig);
        attrn = attrcount_orig;
 
        list_for_each_entry(p, &buffer->scan_el_dev_attr_list, l)

diff --git a/include/linux/iio/buffer_impl.h b/include/linux/iio/buffer_impl.h
index 1e7edf6bed962a951f1935e90782c9ffc937055b..a63dc07b73500b71e0e53d5291dd04734e8bffa5 100644 (file)
--- a/include/linux/iio/buffer_impl.h
+++ b/include/linux/iio/buffer_impl.h
@@ -94,12 +94,6 @@ struct iio_buffer {
        unsigned int watermark;
 
        /* private: */
-       /*
-        * @scan_el_attrs: Control of scan elements if that scan mode
-        * control method is used.
-        */
-       struct attribute_group *scan_el_attrs;
-
        /* @scan_timestamp: Does the scan mode include a timestamp. */
        bool scan_timestamp;