Re: [PATCH v3 2/9] device property: convert to use match_string() helper
From: Rafael J. Wysocki
Date: Fri Jan 08 2016 - 18:02:43 EST
On Friday, January 08, 2016 03:09:11 PM Andy Shevchenko wrote:
> The new helper returns index of the mathing string in an array. We would use it
> here.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
in case you need that.
I think though that it might be more efficient to simply push [1/9] first
maybe with one user and then send the other patches to the relevant maintainers
when that has been applied.
> ---
> drivers/base/property.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index c359351..f902b55 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -647,7 +647,7 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
> const char *propname, const char *string)
> {
> const char **values;
> - int nval, ret, i;
> + int nval, ret;
>
> nval = fwnode_property_read_string_array(fwnode, propname, NULL, 0);
> if (nval < 0)
> @@ -664,13 +664,7 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode,
> if (ret < 0)
> goto out;
>
> - ret = -ENODATA;
> - for (i = 0; i < nval; i++) {
> - if (!strcmp(values[i], string)) {
> - ret = i;
> - break;
> - }
> - }
> + ret = match_string(values, nval, string);
> out:
> kfree(values);
> return ret;
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.