Commit 277982e2 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] 85xx: convert boards to use machine_device_initcall 



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

arch/powerpc/platforms/85xx/mpc85xx_ads.c

+2 −4
Original line number Diff line number Diff line
@@ -233,13 +233,11 @@ static struct of_device_id __initdata of_bus_ids[] = { 


static int __init declare_of_platform_devices(void)

{

	if (!machine_is(mpc85xx_ads))

		return 0;



	of_platform_bus_probe(NULL, of_bus_ids, NULL);



	return 0;

}

device_initcall(declare_of_platform_devices);

machine_device_initcall(mpc85xx_ads, declare_of_platform_devices);



/*

 * Called very early, device-tree isn't unflattened

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+1 −5
Original line number Diff line number Diff line
@@ -222,9 +222,6 @@ static int mpc85xx_cds_8259_attach(void) 
	struct device_node *cascade_node = NULL;

	int cascade_irq;



	if (!machine_is(mpc85xx_cds))

		return 0;



	/* Initialize the i8259 controller */

	for_each_node_by_type(np, "interrupt-controller")

		if (of_device_is_compatible(np, "chrp,iic")) {
@@ -262,8 +259,7 @@ static int mpc85xx_cds_8259_attach(void) 


	return 0;

}



device_initcall(mpc85xx_cds_8259_attach);

machine_device_initcall(mpc85xx_cds, mpc85xx_cds_8259_attach);



#endif /* CONFIG_PPC_I8259 */

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+2 −5
Original line number Diff line number Diff line
@@ -144,15 +144,12 @@ static struct of_device_id mpc85xx_ids[] = { 


static int __init mpc85xx_publish_devices(void)

{

	if (!machine_is(mpc85xx_mds))

		return 0;



	/* Publish the QE devices */

	of_platform_bus_probe(NULL, mpc85xx_ids, NULL);



	return 0;

}

device_initcall(mpc85xx_publish_devices);

machine_device_initcall(mpc85xx_mds, mpc85xx_publish_devices);



static void __init mpc85xx_mds_pic_init(void)

{