Remove includes of <linux/pci-aspm.h> from files that don't need
it. I'll apply all these via the PCI tree unless there's objection.
---
Bjorn Helgaas (4):
igb: Remove unnecessary include of <linux/pci-aspm.h>
ath9k: Remove unnecessary include of <linux/pci-aspm.h>
iwlwifi: Remove unnecessary include of <linux/pci-aspm.h>
PCI: Remove unnecessary include of <linux/pci-aspm.h>
drivers/net/ethernet/intel/igb/igb_main.c | 1 -
drivers/net/wireless/ath/ath9k/pci.c | 1 -
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 -
drivers/pci/pci-sysfs.c | 1 -
drivers/pci/pci.c | 1 -
drivers/pci/probe.c | 1 -
drivers/pci/remove.c | 1 -
7 files changed, 7 deletions(-)
From: Bjorn Helgaas <[email protected]>
The igb driver doesn't need anything provided by pci-aspm.h, so remove
the unnecessary include of it.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
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 <linux/if.h>
#include <linux/if_vlan.h>
#include <linux/pci.h>
-#include <linux/pci-aspm.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/ip.h>
From: Bjorn Helgaas <[email protected]>
The ath9k driver doesn't need anything provided by pci-aspm.h, so remove
the unnecessary include of it.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
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 <linux/nl80211.h>
#include <linux/pci.h>
-#include <linux/pci-aspm.h>
#include <linux/module.h>
#include "ath9k.h"
From: Bjorn Helgaas <[email protected]>
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 <[email protected]>
---
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 <linux/module.h>
#include <linux/pm_runtime.h>
#include <linux/pci.h>
-#include <linux/pci-aspm.h>
#include <linux/acpi.h>
#include "fw/acpi.h"
From: Bjorn Helgaas <[email protected]>
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 <[email protected]>
---
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 <linux/fs.h>
#include <linux/capability.h>
#include <linux/security.h>
-#include <linux/pci-aspm.h>
#include <linux/slab.h>
#include <linux/vgaarb.h>
#include <linux/pm_runtime.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index f5c6ab14fb31..7c2f0e682fc0 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -23,7 +23,6 @@
#include <linux/string.h>
#include <linux/log2.h>
#include <linux/logic_pio.h>
-#include <linux/pci-aspm.h>
#include <linux/pm_wakeup.h>
#include <linux/interrupt.h>
#include <linux/device.h>
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 <linux/slab.h>
#include <linux/module.h>
#include <linux/cpumask.h>
-#include <linux/pci-aspm.h>
#include <linux/aer.h>
#include <linux/acpi.h>
#include <linux/hypervisor.h>
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 <linux/pci.h>
#include <linux/module.h>
-#include <linux/pci-aspm.h>
#include "pci.h"
static void pci_free_resources(struct pci_dev *dev)
On 7/25/2018 12:52 PM, Bjorn Helgaas wrote:
> emove includes of <linux/pci-aspm.h> from files that don't need
> it. I'll apply all these via the PCI tree unless there's objection.
>
> ---
>
> Bjorn Helgaas (4):
> igb: Remove unnecessary include of <linux/pci-aspm.h>
> ath9k: Remove unnecessary include of <linux/pci-aspm.h>
> iwlwifi: Remove unnecessary include of <linux/pci-aspm.h>
> PCI: Remove unnecessary include of <linux/pci-aspm.h>
Thanks.
Reviewed-by: Sinan Kaya <[email protected]>
Is it possible to kill that file altogether? I haven't looked who is
using outside of pci directory.
On Wed, 2018-07-25 at 14:52 -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> 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 <[email protected]>
> ---
Acked-by: Luca Coelho <[email protected]>
Thanks!
--
Cheers,
Luca.
On Wed, Jul 25, 2018 at 01:33:23PM -0700, Sinan Kaya wrote:
> On 7/25/2018 12:52 PM, Bjorn Helgaas wrote:
> > emove includes of <linux/pci-aspm.h> from files that don't need
> > it. I'll apply all these via the PCI tree unless there's objection.
> >
> > ---
> >
> > Bjorn Helgaas (4):
> > igb: Remove unnecessary include of <linux/pci-aspm.h>
> > ath9k: Remove unnecessary include of <linux/pci-aspm.h>
> > iwlwifi: Remove unnecessary include of <linux/pci-aspm.h>
> > PCI: Remove unnecessary include of <linux/pci-aspm.h>
>
> Thanks.
>
> Reviewed-by: Sinan Kaya <[email protected]>
>
> Is it possible to kill that file altogether? I haven't looked who is
> using outside of pci directory.
Thanks for taking a look!
It's possible we could remove it altogether; there's very little in
it, and in most cases the only reason drivers include it is to disable
certain ASPM link states to work around hardware defects. It might
make sense to just move that interface into <linux/pci.h>.
On Wed, Jul 25, 2018 at 12:52 PM, Bjorn Helgaas <[email protected]> wrote:
> From: Bjorn Helgaas <[email protected]>
>
> The igb driver doesn't need anything provided by pci-aspm.h, so remove
> the unnecessary include of it.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
Looks good to me.
Acked-by: Alexander Duyck <[email protected]>
> ---
> 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 <linux/if.h>
> #include <linux/if_vlan.h>
> #include <linux/pci.h>
> -#include <linux/pci-aspm.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> #include <linux/ip.h>
>
> _______________________________________________
> Intel-wired-lan mailing list
> [email protected]
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
On Wed, 2018-07-25 at 14:52 -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> The igb driver doesn't need anything provided by pci-aspm.h, so
> remove
> the unnecessary include of it.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
Acked-by: Jeff Kirsher <[email protected]>
I am fine with you picking up this change.
> ---
> drivers/net/ethernet/intel/igb/igb_main.c | 1 -
> 1 file changed, 1 deletion(-)
Bjorn Helgaas <[email protected]> writes:
> From: Bjorn Helgaas <[email protected]>
>
> The ath9k driver doesn't need anything provided by pci-aspm.h, so remove
> the unnecessary include of it.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
Looks good to me and feel free to take via your tree.
Acked-by: Kalle Valo <[email protected]>
--
Kalle Valo
On Wed, Jul 25, 2018 at 02:52:08PM -0500, Bjorn Helgaas wrote:
> Remove includes of <linux/pci-aspm.h> from files that don't need
> it. I'll apply all these via the PCI tree unless there's objection.
>
> ---
>
> Bjorn Helgaas (4):
> igb: Remove unnecessary include of <linux/pci-aspm.h>
> ath9k: Remove unnecessary include of <linux/pci-aspm.h>
> iwlwifi: Remove unnecessary include of <linux/pci-aspm.h>
> PCI: Remove unnecessary include of <linux/pci-aspm.h>
>
>
> drivers/net/ethernet/intel/igb/igb_main.c | 1 -
> drivers/net/wireless/ath/ath9k/pci.c | 1 -
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 -
> drivers/pci/pci-sysfs.c | 1 -
> drivers/pci/pci.c | 1 -
> drivers/pci/probe.c | 1 -
> drivers/pci/remove.c | 1 -
> 7 files changed, 7 deletions(-)
I applied these to the pci/aspm branch for v4.19.