aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/common.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-04-18 13:11:25 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-04-22 17:47:46 -0400
commit0e94ecd098347874e776f7818728613a335880d1 (patch)
treef81988c89b21e1603e3a8df33e98453dcbfaaadb /arch/x86/pci/common.c
parent0bb1be3e30bfc3e09fa0ff1e887ac7da4a16c3a2 (diff)
x86/PCI: set_pci_bus_resources_arch_default cleanups
Rename set_pci_bus_resources_arch_default to x86_pci_root_bus_res_quirks, move the weak version from common.c to i386.c, and before calling, make sure it's a root bus. Reviewed-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/common.c')
-rw-r--r--arch/x86/pci/common.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index f80ece51305d..2202b6257b82 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -142,10 +142,6 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
142 } 142 }
143} 143}
144 144
145void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)
146{
147}
148
149/* 145/*
150 * Called after each bus is probed, but before its children 146 * Called after each bus is probed, but before its children
151 * are examined. 147 * are examined.
@@ -155,7 +151,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b)
155{ 151{
156 struct pci_dev *dev; 152 struct pci_dev *dev;
157 153
158 set_pci_bus_resources_arch_default(b); 154 /* root bus? */
155 if (!b->parent)
156 x86_pci_root_bus_res_quirks(b);
159 pci_read_bridge_bases(b); 157 pci_read_bridge_bases(b);
160 list_for_each_entry(dev, &b->devices, bus_list) 158 list_for_each_entry(dev, &b->devices, bus_list)
161 pcibios_fixup_device_resources(dev); 159 pcibios_fixup_device_resources(dev);