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

Commit dbf8471f authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Merge ppc32 and ppc64 pcibios_alloc_controller() prototypes 



Make the ppc32 pcibios_alloc_controller take a device node to match
the ppc64 prototypes and have it set arch_data.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 5516b540

arch/powerpc/kernel/pci_32.c

+2 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ pcibios_enable_resources(struct pci_dev *dev, int mask) 
static int next_controller_index;



struct pci_controller * __init

pcibios_alloc_controller(void)

pcibios_alloc_controller(struct device_node *dev)

{

	struct pci_controller *hose;
@@ -621,6 +621,7 @@ pcibios_alloc_controller(void) 
	hose_tail = &hose->next;



	hose->global_number = next_controller_index++;

	hose->arch_data = dev;



	return hose;

}

arch/powerpc/platforms/52xx/efika.c

+1 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void __init efika_pcisetup(void) 
	printk(" controlled by %s\n", pcictrl->full_name);

	printk("\n");



	hose = pcibios_alloc_controller();

	hose = pcibios_alloc_controller(of_node_get(pcictrl));

	if (!hose) {

		printk(KERN_WARNING EFIKA_PLATFORM_NAME

		       ": Can't allocate PCI controller structure for %s\n",
@@ -136,7 +136,6 @@ void __init efika_pcisetup(void) 
		return;

	}



	hose->arch_data = of_node_get(pcictrl);

	hose->first_busno = bus_range[0];

	hose->last_busno = bus_range[1];

	hose->ops = &rtas_pci_ops;

arch/powerpc/platforms/52xx/mpc52xx_pci.c

+1 −3
Original line number Diff line number Diff line
@@ -385,12 +385,10 @@ mpc52xx_add_bridge(struct device_node *node) 
	 * tree are needed to configure the 52xx PCI controller.  Rather

	 * than parse the tree here, let pci_process_bridge_OF_ranges()

	 * do it for us and extract the values after the fact */

	hose = pcibios_alloc_controller();

	hose = pcibios_alloc_controller(node);

	if (!hose)

		return -ENOMEM;



	hose->arch_data = node;



	hose->first_busno = bus_range ? bus_range[0] : 0;

	hose->last_busno = bus_range ? bus_range[1] : 0xff;

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+1 −3
Original line number Diff line number Diff line
@@ -543,13 +543,11 @@ static void __init mpc82xx_add_bridge(struct device_node *np) 


	pci_assign_all_buses = 1;



	hose = pcibios_alloc_controller();

	hose = pcibios_alloc_controller(np);



	if (!hose)

		return;



	hose->arch_data = np;



	hose->first_busno = bus_range ? bus_range[0] : 0;

	hose->last_busno = bus_range ? bus_range[1] : 0xff;

arch/powerpc/platforms/83xx/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -62,10 +62,9 @@ int __init mpc83xx_add_bridge(struct device_node *dev) 
	}



	pci_assign_all_buses = 1;

	hose = pcibios_alloc_controller();

	hose = pcibios_alloc_controller(dev);

	if (!hose)

		return -ENOMEM;

	hose->arch_data = dev;



	hose->first_busno = bus_range ? bus_range[0] : 0;

	hose->last_busno = bus_range ? bus_range[1] : 0xff;