leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

software node: simplify property_entry_read_string_array()

Browse Source 
There is no need to treat string arrays and single strings separately, we can go
exclusively by the element length in relation to data type size.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Dmitry Torokhov 2019-10-23 13:02:27 -07:00 committed by Rafael J. Wysocki
parent daeba9bf62
commit 1afc14032e
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/base/swnode.c
View File

@ -173,28 +173,21 @@ static int property_entry_read_string_array(const struct property_entry *props,
const char *propname, const char *propname,
const char **strings, size_t nval) const char **strings, size_t nval)
{ {
const struct property_entry *prop;
const void *pointer; const void *pointer;
size_t array_len, length; size_t length;
int array_len;
/* Find out the array length. */ /* Find out the array length. */
prop = property_entry_get(props, propname); array_len = property_entry_count_elems_of_size(props, propname,
if (!prop) sizeof(const char *));
return -EINVAL; if (array_len < 0)
return array_len;
if (prop->is_array)
/* Find the length of an array. */
array_len = property_entry_count_elems_of_size(props, propname,
sizeof(const char *));
else
/* The array length for a non-array string property is 1. */
array_len = 1;
/* Return how many there are if strings is NULL. */ /* Return how many there are if strings is NULL. */
if (!strings) if (!strings)
return array_len; return array_len;
array_len = min(nval, array_len); array_len = min_t(size_t, nval, array_len);
length = array_len * sizeof(*strings); length = array_len * sizeof(*strings);
pointer = property_entry_find(props, propname, length); pointer = property_entry_find(props, propname, length);