luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/PCI: Drop return value of pcibios_scan_root()

Browse Source 
Nobody really uses the return value of pcibios_scan_root() (one place uses
it to control a printk, but the printk is not very useful).  This converts
pcibios_scan_root() to a void function.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Bjorn Helgaas 2014-01-28 16:40:36 -07:00
parent 289a24a699
commit 49886cf4c4
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/pci.h
View File

@ -65,7 +65,7 @@ extern unsigned long pci_mem_start;
extern int pcibios_enabled;
void pcibios_config_init(void);
struct pci_bus *pcibios_scan_root(int bus);
void pcibios_scan_root(int bus);
void pcibios_set_master(struct pci_dev *dev);
void pcibios_penalize_isa_irq(int irq, int active);

6
arch/x86/pci/common.c
View File

@ -456,7 +456,7 @@ void __init dmi_check_pciprobe(void)
dmi_check_system(pciprobe_dmi_table);
}
struct pci_bus *pcibios_scan_root(int busnum)
void pcibios_scan_root(int busnum)
{
struct pci_bus *bus;
struct pci_sysdata *sd;
@ -465,7 +465,7 @@ struct pci_bus *pcibios_scan_root(int busnum)
sd = kzalloc(sizeof(*sd), GFP_KERNEL);
if (!sd) {
printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);
return NULL;
return;
}
sd->node = get_mp_bus_to_node(busnum);
x86_pci_root_bus_resources(busnum, &resources);
@ -475,8 +475,6 @@ struct pci_bus *pcibios_scan_root(int busnum)
pci_free_resource_list(&resources);
kfree(sd);
}
return bus;
}
void __init pcibios_set_cache_line_size(void)

4
arch/x86/pci/irq.c
View File

@ -138,9 +138,7 @@ static void __init pirq_peer_trick(void)
for (i = 1; i < 256; i++) {
if (!busmap[i] || pci_find_bus(0, i))
continue;
if (pcibios_scan_root(i))
printk(KERN_INFO "PCI: Discovered primary peer "
"bus %02x [IRQ]\n", i);
pcibios_scan_root(i);
}
pcibios_last_bus = -1;
}