[PATCH] ARM: Remove machine description macros

Remove the pointless machine description macros, favouring C99
initialisers instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 16 insertions, 12 deletions

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 91ba9fd79c87..36e2b6eb67b7 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -292,11 +292,13 @@ static struct sys_timer ap_timer = {
 };
 
 MACHINE_START(INTEGRATOR, "ARM-Integrator")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-        BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
-        BOOT_PARAMS(0x00000100)
-        MAPIO(ap_map_io)
-        INITIRQ(ap_init_irq)
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+        .phys_ram       = 0x00000000,
+        .phys_io        = 0x16000000,
+        .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = ap_map_io,
+        .init_irq       = ap_init_irq,
         .timer          = &ap_timer,
-        INIT_MACHINE(ap_init)
+        .init_machine   = ap_init,
 MACHINE_END
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index e0a01eef0993..569f328c479d 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -532,11 +532,13 @@ static struct sys_timer cp_timer = {
 };
 
 MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-        BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
-        BOOT_PARAMS(0x00000100)
-        MAPIO(intcp_map_io)
-        INITIRQ(intcp_init_irq)
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+        .phys_ram       = 0x00000000,
+        .phys_io        = 0x16000000,
+        .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = intcp_map_io,
+        .init_irq       = intcp_init_irq,
         .timer          = &cp_timer,
-        INIT_MACHINE(intcp_init)
+        .init_machine   = intcp_init,
 MACHINE_END