mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
rdmacg: Convert to use match_string() helper
The new helper returns index of the matching string in an array. We are going to use it here. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
c43c5ea75f
commit
cc659e76f3
1 changed files with 16 additions and 19 deletions
|
@ -362,20 +362,19 @@ EXPORT_SYMBOL(rdmacg_unregister_device);
|
||||||
static int parse_resource(char *c, int *intval)
|
static int parse_resource(char *c, int *intval)
|
||||||
{
|
{
|
||||||
substring_t argstr;
|
substring_t argstr;
|
||||||
const char **table = &rdmacg_resource_names[0];
|
|
||||||
char *name, *value = c;
|
char *name, *value = c;
|
||||||
size_t len;
|
size_t len;
|
||||||
int ret, i = 0;
|
int ret, i;
|
||||||
|
|
||||||
name = strsep(&value, "=");
|
name = strsep(&value, "=");
|
||||||
if (!name || !value)
|
if (!name || !value)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
len = strlen(value);
|
i = match_string(rdmacg_resource_names, RDMACG_RESOURCE_MAX, name);
|
||||||
|
if (i < 0)
|
||||||
|
return i;
|
||||||
|
|
||||||
for (i = 0; i < RDMACG_RESOURCE_MAX; i++) {
|
len = strlen(value);
|
||||||
if (strcmp(table[i], name))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
argstr.from = value;
|
argstr.from = value;
|
||||||
argstr.to = value + len;
|
argstr.to = value + len;
|
||||||
|
@ -383,15 +382,13 @@ static int parse_resource(char *c, int *intval)
|
||||||
ret = match_int(&argstr, intval);
|
ret = match_int(&argstr, intval);
|
||||||
if (ret >= 0) {
|
if (ret >= 0) {
|
||||||
if (*intval < 0)
|
if (*intval < 0)
|
||||||
break;
|
return -EINVAL;
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
if (strncmp(value, RDMACG_MAX_STR, len) == 0) {
|
if (strncmp(value, RDMACG_MAX_STR, len) == 0) {
|
||||||
*intval = S32_MAX;
|
*intval = S32_MAX;
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue