On Mon, 11 May 2020 15:53:22 +0300
Alexandru Ardelean <[email protected]> wrote:
> The variable no longer does anything.
> It should have been removed with commit 2e036804d773e ("iio: buffer: remove
> 'scan_el_attrs' attribute group from buffer struct").
> That was about the last time this was needed.
>
> Signed-off-by: Alexandru Ardelean <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to hopefully not notice it.
Thanks,
Jonathan
> ---
>
> If desired (and still possible) this can be squashed in
> commit 2e036804d773e ("iio: buffer: remove 'scan_el_attrs' attribute group
> from buffer struct").
>
> drivers/iio/industrialio-buffer.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/industrialio-buffer.c
> b/drivers/iio/industrialio-buffer.c
> index eae39eaf49af..386c9231c2ee 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -1244,7 +1244,7 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev
> *indio_dev)
> struct iio_dev_attr *p;
> struct attribute **attr;
> struct iio_buffer *buffer = indio_dev->buffer;
> - int ret, i, attrn, attrcount, attrcount_orig = 0;
> + int ret, i, attrn, attrcount;
> const struct iio_chan_spec *channels;
>
> channels = indio_dev->channels;
> @@ -1288,7 +1288,7 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev
> *indio_dev)
>
> indio_dev->groups[indio_dev->groupcounter++] = &buffer->buffer_group;
>
> - attrcount = attrcount_orig;
> + attrcount = 0;
> INIT_LIST_HEAD(&buffer->scan_el_dev_attr_list);
> channels = indio_dev->channels;
> if (channels) {
> @@ -1325,7 +1325,7 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev
> *indio_dev)
> ret = -ENOMEM;
> goto error_free_scan_mask;
> }
> - attrn = attrcount_orig;
> + attrn = 0;
>
> list_for_each_entry(p, &buffer->scan_el_dev_attr_list, l)
> buffer->scan_el_group.attrs[attrn++] = &p->dev_attr.attr;
