powerpc: Move 32-bit probe() machine to later in the boot process

[karo-tx-linux.git] / arch / powerpc / platforms / embedded6xx / linkstation.c

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 540eeb58d3f03775f275fd9d9ab92b000da2d5a0..f29cf29b11f895799740bd25cd7585024a9b840a 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -100,7 +100,7 @@ static void __init linkstation_init_IRQ(void)
 extern void avr_uart_configure(void);
 extern void avr_uart_send(const char);
 
-static void linkstation_restart(char *cmd)
+static void __noreturn linkstation_restart(char *cmd)
 {
        local_irq_disable();
 
@@ -113,7 +113,7 @@ static void linkstation_restart(char *cmd)
                avr_uart_send('G');     /* "kick" */
 }
 
-static void linkstation_power_off(void)
+static void __noreturn linkstation_power_off(void)
 {
        local_irq_disable();
 
@@ -127,7 +127,7 @@ static void linkstation_power_off(void)
        /* NOTREACHED */
 }
 
-static void linkstation_halt(void)
+static void __noreturn linkstation_halt(void)
 {
        linkstation_power_off();
        /* NOTREACHED */
@@ -141,11 +141,7 @@ static void linkstation_show_cpuinfo(struct seq_file *m)
 
 static int __init linkstation_probe(void)
 {
-       unsigned long root;
-
-       root = of_get_flat_dt_root();
-
-       if (!of_flat_dt_is_compatible(root, "linkstation"))
+       if (!of_machine_is_compatible("linkstation"))
                return 0;
 
        pm_power_off = linkstation_power_off;