mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
device property: convert to use match_string() helper
The new helper returns index of the mathing string in an array. We would use it here. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
56b060814e
commit
a7c1d0a987
@ -651,7 +651,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)
|
||||
@ -668,13 +668,9 @@ 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);
|
||||
if (ret < 0)
|
||||
ret = -ENODATA;
|
||||
out:
|
||||
kfree(values);
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user