From 9e6ca67ffd45b48046778cb653742f72fbb8150b Mon Sep 17 00:00:00 2001
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
Date: Tue, 30 Oct 2012 15:26:18 +0900
Subject: [PATCH] --- yaml --- r: 343251 b: refs/heads/master c:
 642c92da36ae0bed3c31fdd408411ab95f4e326b h: refs/heads/master i:   343249:
 60025e8b12dc71bb59f6e06cf991d7bdbe725dc8   343247:
 9a4660bb4c542d2581851132e3ac265100e1c529 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/pci/common.c   | 2 +-
 trunk/drivers/acpi/pci_root.c | 2 +-
 trunk/drivers/pci/pci.c       | 5 ++---
 trunk/include/linux/pci.h     | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8c69fdd2947e..3b84561a1fc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4761ba2d6adbe24c792ec6223a5884ae4e82430
+refs/heads/master: 642c92da36ae0bed3c31fdd408411ab95f4e326b
diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c
index 720e973fc34a..52dbf1aeeb63 100644
--- a/trunk/arch/x86/pci/common.c
+++ b/trunk/arch/x86/pci/common.c
@@ -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;
diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
index 66f3ae74d130..50f329d7ccff 100644
--- a/trunk/drivers/acpi/pci_root.c
+++ b/trunk/drivers/acpi/pci_root.c
@@ -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 |
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 54858838f098..01b68bfa2321 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -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;
 }
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 786094254d57..9253af697ca4 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -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);