iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] 85xx: convert boards to use machine_device_initcall

Browse Source 
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-01-15 09:42:36 -06:00
parent c51a3fdc0a
commit 277982e2d8
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View File

@ -233,13 +233,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
static int __init declare_of_platform_devices(void) static int __init declare_of_platform_devices(void)
{ {
if (!machine_is(mpc85xx_ads))
return 0;
of_platform_bus_probe(NULL, of_bus_ids, NULL); of_platform_bus_probe(NULL, of_bus_ids, NULL);
return 0; 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 * Called very early, device-tree isn't unflattened

6
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View File

@ -222,9 +222,6 @@ static int mpc85xx_cds_8259_attach(void)
struct device_node *cascade_node = NULL; struct device_node *cascade_node = NULL;
int cascade_irq; int cascade_irq;
if (!machine_is(mpc85xx_cds))
return 0;
/* Initialize the i8259 controller */ /* Initialize the i8259 controller */
for_each_node_by_type(np, "interrupt-controller") for_each_node_by_type(np, "interrupt-controller")
if (of_device_is_compatible(np, "chrp,iic")) { if (of_device_is_compatible(np, "chrp,iic")) {
@ -262,8 +259,7 @@ static int mpc85xx_cds_8259_attach(void)
return 0; return 0;
} }
machine_device_initcall(mpc85xx_cds, mpc85xx_cds_8259_attach);
device_initcall(mpc85xx_cds_8259_attach);
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */

7
arch/powerpc/platforms/85xx/mpc85xx_mds.c
View File

@ -144,15 +144,12 @@ static struct of_device_id mpc85xx_ids[] = {
static int __init mpc85xx_publish_devices(void) static int __init mpc85xx_publish_devices(void)
{ {
if (!machine_is(mpc85xx_mds))
return 0;
/* Publish the QE devices */ /* Publish the QE devices */
of_platform_bus_probe(NULL,mpc85xx_ids,NULL); of_platform_bus_probe(NULL, mpc85xx_ids, NULL);
return 0; return 0;
} }
device_initcall(mpc85xx_publish_devices); machine_device_initcall(mpc85xx_mds, mpc85xx_publish_devices);
static void __init mpc85xx_mds_pic_init(void) static void __init mpc85xx_mds_pic_init(void)
{ {