PCI/AER: use match_string() helper to simplify the code
Subsystems (2)
PATCH 1/1 PCI/AER: use match_string() helper to simplify the code
match_string() returns the index of an array for a matching string, which can be used intead of open coded implementation.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/pci/pcie/aer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/pci/pcie/aer.c +3 -6
@@ -117,7 +117,7 @@ bool pci_aer_available(void)static int ecrc_policy =ECRC_POLICY_DEFAULT ; -static const char *ecrc_policy_str[] = { +static const char *const ecrc_policy_str[] = { [ECRC_POLICY_DEFAULT ] ="bios" , [ECRC_POLICY_OFF ] ="off" , [ECRC_POLICY_ON ] ="on"
@@ -203,11 +203,8 @@ void pcie_ecrc_get_policy(char *str) {int i; -for (i =0 ; i <ARRAY_SIZE (ecrc_policy_str); i++) -if (!strncmp (str, ecrc_policy_str[i], -strlen (ecrc_policy_str[i]))) -break ; -if (i >=ARRAY_SIZE (ecrc_policy_str)) + i =match_string (ecrc_policy_str,ARRAY_SIZE (ecrc_policy_str), str); +if (i <0 )return ; ecrc_policy = i;
Signature · 1 line
2.20.1
Bjorn Helgaas
AppliedQuoted 4 lines · Andy Shevchenko
match_string()returns the index of an array for a matching string, which can be used intead of open coded implementation.Signed-off-by Andy Shevchenko <[email protected]>
Applied to pci/aer for v5.1, thanks!
Quoted 34 lines
--- drivers/pci/pcie/aer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/pci/pcie/aer.c +3
-6@@ -117,7 +117,7 @@ bool pci_aer_available(void)static int ecrc_policy =ECRC_POLICY_DEFAULT ; -static const char *ecrc_policy_str[] = { +static const char *const ecrc_policy_str[] = { [ECRC_POLICY_DEFAULT ] ="bios" , [ECRC_POLICY_OFF ] ="off" , [ECRC_POLICY_ON ] ="on" @@ -203,11 +203,8 @@ void pcie_ecrc_get_policy(char *str) {int i; -for (i =0 ; i <ARRAY_SIZE (ecrc_policy_str); i++) -if (!strncmp (str, ecrc_policy_str[i], -strlen (ecrc_policy_str[i]))) -break ; -if (i >=ARRAY_SIZE (ecrc_policy_str)) + i =match_string (ecrc_policy_str,ARRAY_SIZE (ecrc_policy_str), str); +if (i <0 )return ; ecrc_policy = i;Signature · 1 line
2.20.1