diff options
| author | Bjorn Helgaas | 2018-08-15 14:58:46 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2018-08-15 14:58:46 -0500 |
| commit | 187dacce194216c4d86c2afd0ca490a6d7fbb981 (patch) | |
| tree | 297a6df9c6e4744fe8f3f0092081f5994e667da8 /drivers/pci/pcie | |
| parent | 3c3ab37f4c03dc9c7c917ff3c1e71d6da81d3bd3 (diff) | |
| parent | ce29af2a505627cc8f1deddb84bcbaf186b0bfd5 (diff) | |
Merge branch 'pci/aspm'
- Use sysfs_match_string() to simplify ASPM sysfs parsing (Andy
Shevchenko)
- Remove unnecessary includes of <linux/pci-aspm.h> (Bjorn Helgaas)
* pci/aspm:
PCI: Remove unnecessary include of <linux/pci-aspm.h>
iwlwifi: Remove unnecessary include of <linux/pci-aspm.h>
ath9k: Remove unnecessary include of <linux/pci-aspm.h>
igb: Remove unnecessary include of <linux/pci-aspm.h>
PCI/ASPM: Convert to use sysfs_match_string() helper
Diffstat (limited to 'drivers/pci/pcie')
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index c687c817b47d..5326916715d2 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 = sysfs_match_string(policy_str, val); + if (i < 0) + return i; if (i == aspm_policy) return 0; |