aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-03-09 11:21:29 -0600
committerBjorn Helgaas <helgaas@kernel.org>2018-03-30 17:26:58 -0500
commit842b447f0074b93e9f7db60039fdc72ec14bef9a (patch)
treec4b17c9339748aa9e1c991532827f2c21e64e5c3
parentPCI/portdrv: Remove unnecessary "pcie_ports=auto" parameter (diff)
downloadlinux-dev-842b447f0074b93e9f7db60039fdc72ec14bef9a.tar.xz
linux-dev-842b447f0074b93e9f7db60039fdc72ec14bef9a.zip
PCI/portdrv: Encapsulate pcie_ports_auto inside the port driver
"pcie_ports_auto" is only used inside the PCIe port driver itself, so move it from include/linux/pci.h to portdrv.h so it's not visible to the whole kernel. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/pcie/portdrv.h2
-rw-r--r--include/linux/pci.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 86368f9341d7..62e28b5afa51 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -12,6 +12,8 @@
#include <linux/compiler.h>
+extern bool pcie_ports_auto;
+
/* Service Type */
#define PCIE_PORT_SERVICE_PME_SHIFT 0 /* Power Management Event */
#define PCIE_PORT_SERVICE_PME (1 << PCIE_PORT_SERVICE_PME_SHIFT)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a04b7abc6b7a..dc70a3ce8dc5 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1449,10 +1449,8 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d,
#ifdef CONFIG_PCIEPORTBUS
extern bool pcie_ports_disabled;
-extern bool pcie_ports_auto;
#else
#define pcie_ports_disabled true
-#define pcie_ports_auto false
#endif
#ifdef CONFIG_PCIEASPM