1 files changed, 2 insertions, 19 deletions

diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 4f94cd87972a..2c70f74fed5d 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -9,7 +9,6 @@
 #include <linux/clocksource.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/irqchip.h>
 #include <asm/sizes.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -17,16 +16,6 @@
 #include <linux/of_platform.h>
 #include "common.h"
 
-static struct of_device_id sirfsoc_of_bus_ids[] __initdata = {
-        { .compatible = "simple-bus", },
-        {},
-};
-
-void __init sirfsoc_mach_init(void)
-{
-        of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL);
-}
-
 void __init sirfsoc_init_late(void)
 {
         sirfsoc_pm_init();
@@ -55,9 +44,7 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
         .nr_irqs        = 128,
         .map_io         = sirfsoc_map_io,
-        .init_irq       = irqchip_init,
         .init_time      = sirfsoc_init_time,
-        .init_machine   = sirfsoc_mach_init,
         .init_late      = sirfsoc_init_late,
         .dt_compat      = atlas6_dt_match,
         .restart        = sirfsoc_restart,
@@ -66,18 +53,16 @@ MACHINE_END
 
 #ifdef CONFIG_ARCH_PRIMA2
 static const char *prima2_dt_match[] __initdata = {
-       "sirf,prima2",
-       NULL
+        "sirf,prima2",
+        NULL
 };
 
 DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
         .nr_irqs        = 128,
         .map_io         = sirfsoc_map_io,
-        .init_irq       = irqchip_init,
         .init_time      = sirfsoc_init_time,
         .dma_zone_size  = SZ_256M,
-        .init_machine   = sirfsoc_mach_init,
         .init_late      = sirfsoc_init_late,
         .dt_compat      = prima2_dt_match,
         .restart        = sirfsoc_restart,
@@ -94,9 +79,7 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
         .smp            = smp_ops(sirfsoc_smp_ops),
         .map_io         = sirfsoc_map_io,
-        .init_irq       = irqchip_init,
         .init_time      = sirfsoc_init_time,
-        .init_machine   = sirfsoc_mach_init,
         .init_late      = sirfsoc_init_late,
         .dt_compat      = marco_dt_match,
         .restart        = sirfsoc_restart,