prpmc1100-setup.c, ixdp425-setup.c, coyote-setup.c:

  Add INIT_MACHINE() to ixp4xx platform setup code

arch/arm/mach-ixp4xx/coyote-setup.c

@@ -73,18 +73,11 @@ static struct platform_device coyote_flash_device = {
 	.resource	= &coyote_flash_resource,
 };
 
-static int __init coyote_init(void)
+static void __init coyote_init(void)
 {
-	if (!machine_is_adi_coyote())
-		return -ENODEV;
-
 	platform_add_device(&coyote_flash_device);
-
-	return 0;
 }
 
-arch_initcall(coyote_init);
-
 MACHINE_START(ADI_COYOTE, "ADI Engineering IXP4XX Coyote Development Platform")
         MAINTAINER("MontaVista Software, Inc.")
         BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
@@ -92,6 +85,6 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering IXP4XX Coyote Development Platform")
         MAPIO(coyote_map_io)
         INITIRQ(ixp4xx_init_irq)
         BOOT_PARAMS(0x0100)
+	INIT_MACHINE(coyote_init)
 MACHINE_END
 
-

arch/arm/mach-ixp4xx/ixdp425-setup.c

@@ -101,21 +101,12 @@ static struct platform_device ixdp425_i2c_controller = {
 	.num_resources	= 0
 };
 
-static int __init ixdp425_init(void)
+static void __init ixdp425_init(void)
 {
-	if (!machine_is_ixdp425() 
-		&& !machine_is_ixcdp1100()
-		&& !machine_is_avila())
-		return -ENODEV;
-
 	platform_add_device(&ixdp425_flash_device);
 	platform_add_device(&ixdp425_i2c_controller);
-
-	return 0;
 }
 
-arch_initcall(ixdp425_init);
-
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
 	MAINTAINER("MontaVista Software, Inc.")
 	BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
@@ -123,6 +114,7 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
 	MAPIO(ixdp425_map_io)
 	INITIRQ(ixp4xx_init_irq)
 	BOOT_PARAMS(0x0100)
+	INIT_MACHINE(ixdp425_init)
 MACHINE_END
 
 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
@@ -132,6 +124,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
 	MAPIO(ixdp425_map_io)
 	INITIRQ(ixp4xx_init_irq)
 	BOOT_PARAMS(0x0100)
+	INIT_MACHINE(ixdp425_init)
 MACHINE_END
 
 /*
@@ -148,6 +141,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform")
 	MAPIO(ixdp425_map_io)
 	INITIRQ(ixp4xx_init_irq)
 	BOOT_PARAMS(0x0100)
+	INIT_MACHINE(ixdp425_init)
 MACHINE_END
 #endif
 

arch/arm/mach-ixp4xx/prpmc1100-setup.c

@@ -73,18 +73,11 @@ static struct platform_device prpmc1100_flash_device = {
 	.resource	= &prpmc1100_flash_resource,
 };
 
-static int __init prpmc1100_init(void)
+static void __init prpmc1100_init(void)
 {
-	if (!machine_is_prpmc1100())
-		return -ENODEV;
-
 	platform_add_device(&prpmc1100_flash_device);
-
-	return 0;
 }
 
-arch_initcall(prpmc1100_init);
-
 MACHINE_START(PRPMC1100, "Motorola PrPMC1100")
         MAINTAINER("MontaVista Software, Inc.")
         BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
@@ -92,5 +85,6 @@ MACHINE_START(PRPMC1100, "Motorola PrPMC1100")
         MAPIO(prpmc1100_map_io)
         INITIRQ(ixp4xx_init_irq)
         BOOT_PARAMS(0x0100)
+	INIT_MACHINE(prpmc1100_init)
 MACHINE_END