leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Don't pass pci_dev to pci_ext_cfg_avail()

Browse Source 
pci_ext_cfg_avail() doesn't use the "struct pci_dev *" passed to
it, and there's no requirement that a host bridge even be represented
by a pci_dev.  This drops the pci_ext_cfg_avail() parameter.

[bhelgaas: changelog]
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Taku Izumi
2012-10-30 15:26:18 +09:00
committed by Bjorn Helgaas
parent d4761ba2d6
commit 642c92da36
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/pci/common.c
View File

@@ -626,7 +626,7 @@ void pcibios_disable_device (struct pci_dev *dev)
pcibios_disable_irq(dev); pcibios_disable_irq(dev);
} }
int pci_ext_cfg_avail(struct pci_dev *dev) int pci_ext_cfg_avail(void)
{ {
if (raw_pci_ext_ops) if (raw_pci_ext_ops)
return 1; return 1;

2
drivers/acpi/pci_root.c
View File

@@ -564,7 +564,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
acpi_pci_bridge_scan(child); acpi_pci_bridge_scan(child);
/* Indicate support for various _OSC capabilities. */ /* Indicate support for various _OSC capabilities. */
if (pci_ext_cfg_avail(root->bus->self)) if (pci_ext_cfg_avail())
flags |= OSC_EXT_PCI_CONFIG_SUPPORT; flags |= OSC_EXT_PCI_CONFIG_SUPPORT;
if (pcie_aspm_support_enabled()) if (pcie_aspm_support_enabled())
flags |= OSC_ACTIVE_STATE_PWR_SUPPORT | flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |

5
drivers/pci/pci.c
View File

@@ -3833,14 +3833,13 @@ static void __devinit pci_no_domains(void)
} }
/** /**
* pci_ext_cfg_enabled - can we access extended PCI config space? * pci_ext_cfg_avail - can we access extended PCI config space?
* @dev: The PCI device of the root bridge.
* *
* Returns 1 if we can access PCI extended config space (offsets * Returns 1 if we can access PCI extended config space (offsets
* greater than 0xff). This is the default implementation. Architecture * greater than 0xff). This is the default implementation. Architecture
* implementations can override this. * implementations can override this.
*/ */
int __weak pci_ext_cfg_avail(struct pci_dev *dev) int __weak pci_ext_cfg_avail(void)
{ {
return 1; return 1;
} }

2
include/linux/pci.h
View File

@@ -1604,7 +1604,7 @@ static inline void pci_mmcfg_early_init(void) { }
static inline void pci_mmcfg_late_init(void) { } static inline void pci_mmcfg_late_init(void) { }
#endif #endif
int pci_ext_cfg_avail(struct pci_dev *dev); int pci_ext_cfg_avail(void);
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar); void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);