PCI: change the signature of pci_ext_cfg_avail function
The default implementation of pci_ext_cfg_avail and
its only overridden function for x86 architecture doesn't
use passed *pci_dev. This patch ommits the parameter of
pci_ext_cfg_avail function.
Signed-off-by: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
---
arch/x86/pci/common.c | 2 +-
drivers/acpi/pci_root.c | 2 +-
drivers/pci/pci.c | 5 ++---
include/linux/pci.h | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
Index: pci/arch/x86/pci/common.c
===================================================================
--- pci.orig/arch/x86/pci/common.c
+++ pci/arch/x86/pci/common.c
@@ -626,7 +626,7 @@ void pcibios_disable_device (struct pci_
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;
Index: pci/drivers/acpi/pci_root.c
===================================================================
--- pci.orig/drivers/acpi/pci_root.c
+++ pci/drivers/acpi/pci_root.c
@@ -564,7 +564,7 @@ static int __devinit acpi_pci_root_add(s
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 |
Index: pci/drivers/pci/pci.c
===================================================================
--- pci.orig/drivers/pci/pci.c
+++ pci/drivers/pci/pci.c
@@ -3833,14 +3833,13 @@ static void __devinit pci_no_domains(voi
}
/**
- * 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;
}
Index: pci/include/linux/pci.h
===================================================================
--- pci.orig/include/linux/pci.h
+++ pci/include/linux/pci.h
@@ -1623,7 +1623,7 @@ static inline void pci_mmcfg_early_init(
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);
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
