diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-03-09 12:21:29 -0500 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-03-30 18:26:58 -0400 |
commit | 842b447f0074b93e9f7db60039fdc72ec14bef9a (patch) | |
tree | c4b17c9339748aa9e1c991532827f2c21e64e5c3 | |
parent | 4c0fd7648d880d98add62552cffdf993bde65cf8 (diff) |
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.h | 2 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
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 @@ | |||
12 | 12 | ||
13 | #include <linux/compiler.h> | 13 | #include <linux/compiler.h> |
14 | 14 | ||
15 | extern bool pcie_ports_auto; | ||
16 | |||
15 | /* Service Type */ | 17 | /* Service Type */ |
16 | #define PCIE_PORT_SERVICE_PME_SHIFT 0 /* Power Management Event */ | 18 | #define PCIE_PORT_SERVICE_PME_SHIFT 0 /* Power Management Event */ |
17 | #define PCIE_PORT_SERVICE_PME (1 << PCIE_PORT_SERVICE_PME_SHIFT) | 19 | #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, | |||
1449 | 1449 | ||
1450 | #ifdef CONFIG_PCIEPORTBUS | 1450 | #ifdef CONFIG_PCIEPORTBUS |
1451 | extern bool pcie_ports_disabled; | 1451 | extern bool pcie_ports_disabled; |
1452 | extern bool pcie_ports_auto; | ||
1453 | #else | 1452 | #else |
1454 | #define pcie_ports_disabled true | 1453 | #define pcie_ports_disabled true |
1455 | #define pcie_ports_auto false | ||
1456 | #endif | 1454 | #endif |
1457 | 1455 | ||
1458 | #ifdef CONFIG_PCIEASPM | 1456 | #ifdef CONFIG_PCIEASPM |