[backfire] merge r27449

[10.03/openwrt.git] / target / linux / ifxmips / files / arch / mips / ifxmips / reset.c

diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
index 4953c60..c3119bc 100644 (file)
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
@@ -1,6 +1,4 @@
 /*
- *   arch/mips/ifxmips/prom.c
- *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -15,50 +13,45 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
- *   Copyright (C) 2005 infineon
- *
- *   Rewrite of Infineon IFXMips code, thanks to infineon for the support,
- *   software and hardware
- *
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
- *
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
  */
 
 #include <linux/kernel.h>
 #include <linux/pm.h>
+#include <linux/io.h>
+
 #include <asm/reboot.h>
 #include <asm/system.h>
-#include <asm/io.h>
-#include <asm/ifxmips/ifxmips.h>
+#include <ifxmips.h>
 
-static void
-ifxmips_machine_restart (char *command)
+static void ifxmips_machine_restart(char *command)
 {
-       printk (KERN_NOTICE "System restart\n");
-       local_irq_disable ();
+       printk(KERN_NOTICE "System restart\n");
+       local_irq_disable();
 
-       ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_REQ) | IFXMIPS_RST_ALL, IFXMIPS_RCU_REQ);
-       for (;;);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_RST) | IFXMIPS_RCU_RST_ALL,
+               IFXMIPS_RCU_RST);
+       for (;;)
+               ;
 }
 
-static void
-ifxmips_machine_halt (void)
+static void ifxmips_machine_halt(void)
 {
-       printk (KERN_NOTICE "System halted.\n");
-       local_irq_disable ();
-       for (;;);
+       printk(KERN_NOTICE "System halted.\n");
+       local_irq_disable();
+       for (;;)
+               ;
 }
 
-static void
-ifxmips_machine_power_off (void)
+static void ifxmips_machine_power_off(void)
 {
-       printk (KERN_NOTICE "Please turn off the power now.\n");
-       local_irq_disable ();
-       for (;;);
+       printk(KERN_NOTICE "Please turn off the power now.\n");
+       local_irq_disable();
+       for (;;)
+               ;
 }
 
-void
-ifxmips_reboot_setup (void)
+void ifxmips_reboot_setup(void)
 {
        _machine_restart = ifxmips_machine_restart;
        _machine_halt = ifxmips_machine_halt;