[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5f9b713b-9c71-7da6-e674-b6ebd28dc5d5@metafoo.de>
Date: Wed, 18 Jan 2023 07:22:30 -0800
From: Lars-Peter Clausen <lars@...afoo.de>
To: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Jonathan Cameron <Jonathan.Cameron@...wei.com>,
linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Jonathan Cameron <jic23@...nel.org>,
Michael Hennerich <michael.hennerich@...log.com>
Subject: Re: [PATCH v1 1/2] iio: core: Replace
iio_sysfs_match_string_with_gaps() by __sysfs_match_string()
On 1/17/23 23:48, Andy Shevchenko wrote:
> None of the current users is using gaps in the list of the items.
> No need to have a specific function for that, just replace it by
> library available __sysfs_match_string().
Hm, I specifically remember adding this for a driver where there were
gaps. One of the DACs. But it might be that the driver itself never made
it upstream.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> ---
> drivers/iio/industrialio-core.c | 32 +-------------------------------
> 1 file changed, 1 insertion(+), 31 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 52e690f031cb..26e357f14db8 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -205,36 +205,6 @@ bool iio_buffer_enabled(struct iio_dev *indio_dev)
> }
> EXPORT_SYMBOL_GPL(iio_buffer_enabled);
>
> -/**
> - * iio_sysfs_match_string_with_gaps - matches given string in an array with gaps
> - * @array: array of strings
> - * @n: number of strings in the array
> - * @str: string to match with
> - *
> - * Returns index of @str in the @array or -EINVAL, similar to match_string().
> - * Uses sysfs_streq instead of strcmp for matching.
> - *
> - * This routine will look for a string in an array of strings.
> - * The search will continue until the element is found or the n-th element
> - * is reached, regardless of any NULL elements in the array.
> - */
> -static int iio_sysfs_match_string_with_gaps(const char * const *array, size_t n,
> - const char *str)
> -{
> - const char *item;
> - int index;
> -
> - for (index = 0; index < n; index++) {
> - item = array[index];
> - if (!item)
> - continue;
> - if (sysfs_streq(item, str))
> - return index;
> - }
> -
> - return -EINVAL;
> -}
> -
> #if defined(CONFIG_DEBUG_FS)
> /*
> * There's also a CONFIG_DEBUG_FS guard in include/linux/iio/iio.h for
> @@ -569,7 +539,7 @@ ssize_t iio_enum_write(struct iio_dev *indio_dev,
> if (!e->set)
> return -EINVAL;
>
> - ret = iio_sysfs_match_string_with_gaps(e->items, e->num_items, buf);
> + ret = __sysfs_match_string(e->items, e->num_items, buf);
> if (ret < 0)
> return ret;
>
Powered by blists - more mailing lists