[v1] PCI/ASPM: Convert to use match_string() helper

Message ID 20180529133247.19728-1-andriy.shevchenko@linux.intel.com
State Accepted
Delegated to: Bjorn Helgaas
Headers show
Series
  • [v1] PCI/ASPM: Convert to use match_string() helper
Related show

Commit Message

Andy Shevchenko May 29, 2018, 1:32 p.m.
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>
---
 drivers/pci/pcie/aspm.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Bjorn Helgaas June 30, 2018, 1:56 a.m. | #1
On Tue, May 29, 2018 at 04:32:47PM +0300, Andy Shevchenko wrote:
> 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>

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

> ---
>  drivers/pci/pcie/aspm.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index c687c817b47d..0e88b3ad065f 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -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;
>  
> -- 
> 2.17.0
>

Patch

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index c687c817b47d..0e88b3ad065f 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -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;