Skip to contentSkip to conversation

PCI/ASPM: Convert to use match_string() helper

PATCH Applied Andy Shevchenko 2 participants 2 messages May 29, 2018 – Jun 30, 2018 PCI

lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 PCI/ASPM: 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 <[email protected]>
---
 drivers/pci/pcie/aspm.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/pci/pcie/aspm.c +3 -5
index c687c817b47d..0e88b3ad065f 100644
@@ -1127,11 +1127,9 @@ static int pcie_aspm_set_policy(const char *val,
 
 	if (aspm_disabled)
 		return -EPERM;
-	for (i = 0; i < ARRAY_SIZE(policy_str); i++)
-		if (!strncmp(val, policy_str[i], strlen(policy_str[i])))
-			break;
-	if (i >= ARRAY_SIZE(policy_str))
-		return -EINVAL;
+	i = match_string(policy_str, ARRAY_SIZE(policy_str), val);
+	if (i < 0)
+		return i;
 	if (i == aspm_policy)
 		return 0;
Signature · 1 line
2.17.0
Applied
#1 lore raw
Quoted 4 lines · Andy Shevchenko

The new helper returns index of the matching string in an array. We are going to use it here.

Signed-off-by Andy Shevchenko <[email protected]>

Applied to pci/aspm for v4.19, thanks!

Quoted 26 lines
---
 drivers/pci/pcie/aspm.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/pci/pcie/aspm.c +3 -5
index c687c817b47d..0e88b3ad065f 100644
@@ -1127,11 +1127,9 @@ static int pcie_aspm_set_policy(const char *val,
 
 	if (aspm_disabled)
 		return -EPERM;
-	for (i = 0; i < ARRAY_SIZE(policy_str); i++)
-		if (!strncmp(val, policy_str[i], strlen(policy_str[i])))
-			break;
-	if (i >= ARRAY_SIZE(policy_str))
-		return -EINVAL;
+	i = match_string(policy_str, ARRAY_SIZE(policy_str), val);
+	if (i < 0)
+		return i;
 	if (i == aspm_policy)
 		return 0;
Signature · 1 line
2.17.0