From 36131ce9a0b23ed6feb04f8a3ffaa44b804abd5e Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Mon, 6 Aug 2018 14:30:34 -0500 Subject: [PATCH 1/5] PCI/ASPM: Convert to use sysfs_match_string() helper The sysfs_match_string() helper returns index of the matching string in an array. Use it in pcie_aspm_set_policy() to simplify the code. Signed-off-by: Andy Shevchenko [bhelgaas: squash sysfs_match_string() fix into original patch for issue Reported-by: Heiner Kallweit ] Signed-off-by: Bjorn Helgaas --- 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..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; From f5ddcf71e66eac681500ab94df0f9e33c4f2b4a7 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 25 Jul 2018 14:53:40 -0500 Subject: [PATCH 2/5] igb: Remove unnecessary include of The igb driver doesn't need anything provided by pci-aspm.h, so remove the unnecessary include of it. Signed-off-by: Bjorn Helgaas Reviewed-by: Sinan Kaya Acked-by: Alexander Duyck Acked-by: Jeff Kirsher --- drivers/net/ethernet/intel/igb/igb_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index f707709969ac..c77fda05f683 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include From a78613c08267107e3ffaa40290a269be79386fce Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 25 Jul 2018 14:53:40 -0500 Subject: [PATCH 3/5] ath9k: Remove unnecessary include of The ath9k driver doesn't need anything provided by pci-aspm.h, so remove the unnecessary include of it. Signed-off-by: Bjorn Helgaas Reviewed-by: Sinan Kaya Acked-by: Kalle Valo --- drivers/net/wireless/ath/ath9k/pci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 645f0fbd9179..92b2dd396436 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -18,7 +18,6 @@ #include #include -#include #include #include "ath9k.h" From 2b2654b8922a46aeabc9bf13e0361a96110317e7 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 25 Jul 2018 14:53:41 -0500 Subject: [PATCH 4/5] iwlwifi: Remove unnecessary include of This part of the iwlwifi driver doesn't need anything provided by pci-aspm.h, so remove the unnecessary include of it. Signed-off-by: Bjorn Helgaas Reviewed-by: Sinan Kaya Acked-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 38234bda9017..d6c55e111fda 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -72,7 +72,6 @@ #include #include #include -#include #include #include "fw/acpi.h" From ce29af2a505627cc8f1deddb84bcbaf186b0bfd5 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 25 Jul 2018 14:53:42 -0500 Subject: [PATCH 5/5] PCI: Remove unnecessary include of Several PCI core files include pci-aspm.h even though they don't need anything provided by that file. Remove the unnecessary includes of it. Signed-off-by: Bjorn Helgaas Reviewed-by: Sinan Kaya --- drivers/pci/pci-sysfs.c | 1 - drivers/pci/pci.c | 1 - drivers/pci/probe.c | 1 - drivers/pci/remove.c | 1 - 4 files changed, 4 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 0c4653c1d2ce..91337faae60d 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 97acba712e4e..d92d216e4f64 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ac876e32de4b..1ed2852dee21 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 6f072eae4f7a..01ec7fcb5634 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include #include -#include #include "pci.h" static void pci_free_resources(struct pci_dev *dev)