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

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

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

arch/x86/pci/common.c

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

 *  are examined.
@@ -151,6 +155,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) 
{

	struct pci_dev *dev;



	set_pci_bus_resources_arch_default(b);

	pci_read_bridge_bases(b);

	list_for_each_entry(dev, &b->devices, bus_list)

		pcibios_fixup_device_resources(dev);

drivers/pci/probe.c

+0 −6
Original line number Diff line number Diff line
@@ -1118,10 +1118,6 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) 
	return max;

}



void __attribute__((weak)) set_pci_bus_resources_arch_default(struct pci_bus *b)

{

}



struct pci_bus * pci_create_bus(struct device *parent,

		int bus, struct pci_ops *ops, void *sysdata)

{
@@ -1180,8 +1176,6 @@ struct pci_bus * pci_create_bus(struct device *parent, 
	b->resource[0] = &ioport_resource;

	b->resource[1] = &iomem_resource;



	set_pci_bus_resources_arch_default(b);



	return b;



dev_create_file_err: