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

Commit 49886cf4 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

x86/PCI: Drop return value of pcibios_scan_root() 



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: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 289a24a6

arch/x86/include/asm/pci.h

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

arch/x86/pci/common.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

arch/x86/pci/irq.c

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

}