Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 642c92da authored by Taku Izumi's avatar Taku Izumi Committed by Bjorn Helgaas
Browse files

PCI: Don't pass pci_dev to pci_ext_cfg_avail() 



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: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent d4761ba2

arch/x86/pci/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/acpi/pci_root.c

+1 −1
Original line number Diff line number Diff line
@@ -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 |

drivers/pci/pci.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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);