Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / mips / sni / reset.c

diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index be85bec..79f8d70 100644 (file)
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -13,12 +13,11 @@
  * controller to pulse the reset-line low. We try that for a while,
  * and if it doesn't work, we do some other stupid things.
  */
-static inline void
-kb_wait(void)
+static inline void kb_wait(void)
 {
        int i;
 
-       for (i=0; i<0x10000; i++)
+       for (i = 0; i < 0x10000; i++)
                if ((inb_p(0x64) & 0x02) == 0)
                        break;
 }
@@ -32,19 +31,15 @@ void sni_machine_restart(char *command)
           We can do that easier ...  */
        local_irq_disable();
        for (;;) {
-               for (i=0; i<100; i++) {
+               for (i = 0; i < 100; i++) {
                        kb_wait();
-                       for(j = 0; j < 100000 ; j++)
+                       for (j = 0; j < 100000 ; j++)
                                /* nothing */;
-                       outb_p(0xfe,0x64);       /* pulse reset low */
+                       outb_p(0xfe, 0x64);      /* pulse reset low */
                }
        }
 }
 
-void sni_machine_halt(void)
-{
-}
-
 void sni_machine_power_off(void)
 {
        *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;