Commit 0bb1be3e authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Jesse Barnes

x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86

Commit 30a18d6c introduced a new
function to set the PCI bus resources.  Unfortunately, neither the
author, nor the committers seemed to know that we already have somewhere
to do that -- pcibios_fixup_bus().  This patch moves the hook (used only
by the K8 code) into x86-specific code where it should have been in the
first place.

Cc: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 044cd809
...@@ -142,6 +142,10 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) ...@@ -142,6 +142,10 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
} }
} }
void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)
{
}
/* /*
* Called after each bus is probed, but before its children * Called after each bus is probed, but before its children
* are examined. * are examined.
...@@ -151,6 +155,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) ...@@ -151,6 +155,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b)
{ {
struct pci_dev *dev; struct pci_dev *dev;
set_pci_bus_resources_arch_default(b);
pci_read_bridge_bases(b); pci_read_bridge_bases(b);
list_for_each_entry(dev, &b->devices, bus_list) list_for_each_entry(dev, &b->devices, bus_list)
pcibios_fixup_device_resources(dev); pcibios_fixup_device_resources(dev);
......
...@@ -1118,10 +1118,6 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) ...@@ -1118,10 +1118,6 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
return max; return max;
} }
void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)
{
}
struct pci_bus * pci_create_bus(struct device *parent, struct pci_bus * pci_create_bus(struct device *parent,
int bus, struct pci_ops *ops, void *sysdata) int bus, struct pci_ops *ops, void *sysdata)
{ {
...@@ -1180,8 +1176,6 @@ struct pci_bus * pci_create_bus(struct device *parent, ...@@ -1180,8 +1176,6 @@ struct pci_bus * pci_create_bus(struct device *parent,
b->resource[0] = &ioport_resource; b->resource[0] = &ioport_resource;
b->resource[1] = &iomem_resource; b->resource[1] = &iomem_resource;
set_pci_bus_resources_arch_default(b);
return b; return b;
dev_create_file_err: dev_create_file_err:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment