Skip to content

Commit

Permalink
x86/PCI: set_pci_bus_resources_arch_default cleanups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Jesse Barnes committed Apr 22, 2009
1 parent 0bb1be3 commit 0e94ecd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/topology.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static inline void arch_fix_phys_package_id(int num, u32 slot)
}

struct pci_bus;
void set_pci_bus_resources_arch_default(struct pci_bus *b);
void x86_pci_root_bus_res_quirks(struct pci_bus *b);

#ifdef CONFIG_SMP
#define mc_capable() (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/pci/amd_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ struct pci_root_info {
static int pci_root_num;
static struct pci_root_info pci_root_info[PCI_ROOT_NR];

void set_pci_bus_resources_arch_default(struct pci_bus *b)
void x86_pci_root_bus_res_quirks(struct pci_bus *b)
{
int i;
int j;
Expand Down
8 changes: 3 additions & 5 deletions arch/x86/pci/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@ 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.
Expand All @@ -155,7 +151,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b)
{
struct pci_dev *dev;

set_pci_bus_resources_arch_default(b);
/* root bus? */
if (!b->parent)
x86_pci_root_bus_res_quirks(b);
pci_read_bridge_bases(b);
list_for_each_entry(dev, &b->devices, bus_list)
pcibios_fixup_device_resources(dev);
Expand Down
4 changes: 4 additions & 0 deletions arch/x86/pci/i386.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ void __init pcibios_resource_survey(void)
*/
fs_initcall(pcibios_assign_resources);

void __weak x86_pci_root_bus_res_quirks(struct pci_bus *b)
{
}

/*
* If we set up a device for bus mastering, we need to check the latency
* timer as certain crappy BIOSes forget to set it properly.
Expand Down

0 comments on commit 0e94ecd

Please sign in to comment.