Skip to content

Commit

Permalink
PCI: Don't pass pci_dev to pci_ext_cfg_avail()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Taku Izumi authored and Bjorn Helgaas committed Nov 7, 2012
1 parent d4761ba commit 642c92d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/x86/pci/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ void pcibios_disable_device (struct pci_dev *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)
return 1;
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/pci_root.c
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
acpi_pci_bridge_scan(child);

/* 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;
if (pcie_aspm_support_enabled())
flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |
Expand Down
5 changes: 2 additions & 3 deletions drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -3833,14 +3833,13 @@ static void __devinit pci_no_domains(void)
}

/**
* pci_ext_cfg_enabled - can we access extended PCI config space?
* @dev: The PCI device of the root bridge.
* pci_ext_cfg_avail - can we access extended PCI config space?
*
* Returns 1 if we can access PCI extended config space (offsets
* greater than 0xff). This is the default implementation. Architecture
* implementations can override this.
*/
int __weak pci_ext_cfg_avail(struct pci_dev *dev)
int __weak pci_ext_cfg_avail(void)
{
return 1;
}
Expand Down
2 changes: 1 addition & 1 deletion include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ static inline void pci_mmcfg_early_init(void) { }
static inline void pci_mmcfg_late_init(void) { }
#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);

Expand Down

0 comments on commit 642c92d

Please sign in to comment.