3 files changed, 7 insertions, 31 deletions

diff --git a/arch/mips/txx9/jmr3927/irq.c b/arch/mips/txx9/jmr3927/irq.c
index 68f74368ddec..6ec626c9473f 100644
--- a/arch/mips/txx9/jmr3927/irq.c
+++ b/arch/mips/txx9/jmr3927/irq.c
@@ -30,15 +30,11 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/init.h>
-#include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
 
 #include <asm/io.h>
 #include <asm/mipsregs.h>
-#include <asm/system.h>
-
-#include <asm/processor.h>
 #include <asm/txx9/generic.h>
 #include <asm/txx9/jmr3927.h>
 
diff --git a/arch/mips/txx9/jmr3927/prom.c b/arch/mips/txx9/jmr3927/prom.c
index 2cadb423face..23df38c1490e 100644
--- a/arch/mips/txx9/jmr3927/prom.c
+++ b/arch/mips/txx9/jmr3927/prom.c
@@ -36,6 +36,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <asm/bootinfo.h>
 #include <asm/txx9/generic.h>
 #include <asm/txx9/jmr3927.h>
@@ -56,20 +57,11 @@ prom_putchar(char c)
         return;
 }
 
-void
-puts(const char *cp)
-{
-    while (*cp)
-        prom_putchar(*cp++);
-    prom_putchar('\r');
-    prom_putchar('\n');
-}
-
 void __init jmr3927_prom_init(void)
 {
         /* CCFG */
         if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
-                puts("Warning: TX3927 TLB off\n");
+                printk(KERN_ERR "TX3927 TLB off\n");
 
         prom_init_cmdline();
         add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 7378a835d4e3..cf7513d95fa7 100644
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -74,9 +74,6 @@ static void __init jmr3927_mem_setup(void)
 
         _machine_restart = jmr3927_machine_restart;
 
-        /* Reboot on panic */
-        panic_timeout = 180;
-
         /* cache setup */
         {
                 unsigned int conf;
@@ -94,7 +91,8 @@ static void __init jmr3927_mem_setup(void)
 #endif
 
                 conf = read_c0_conf();
-                conf &= ~(TX39_CONF_ICE | TX39_CONF_DCE | TX39_CONF_WBON | TX39_CONF_CWFON);
+                conf &= ~(TX39_CONF_ICE | TX39_CONF_DCE |
+                          TX39_CONF_WBON | TX39_CONF_CWFON);
                 conf |= mips_ic_disable ? 0 : TX39_CONF_ICE;
                 conf |= mips_dc_disable ? 0 : TX39_CONF_DCE;
                 conf |= mips_config_wbon ? TX39_CONF_WBON : 0;
@@ -107,19 +105,11 @@ static void __init jmr3927_mem_setup(void)
         /* initialize board */
         jmr3927_board_init();
 
-        argptr = prom_getcmdline();
-        if ((argptr = strstr(argptr, "ip=")) == NULL) {
-                argptr = prom_getcmdline();
-                strcat(argptr, " ip=bootp");
-        }
-
         tx3927_setup_serial(1 << 1); /* ch1: noCTS */
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
         argptr = prom_getcmdline();
-        if ((argptr = strstr(argptr, "console=")) == NULL) {
-                argptr = prom_getcmdline();
+        if (!strstr(argptr, "console="))
                 strcat(argptr, " console=ttyS1,115200");
-        }
 #endif
 }
 
@@ -199,16 +189,14 @@ static unsigned long jmr3927_swizzle_addr_b(unsigned long port)
 #endif
 }
 
-static int __init jmr3927_rtc_init(void)
+static void __init jmr3927_rtc_init(void)
 {
         static struct resource __initdata res = {
                 .start  = JMR3927_IOC_NVRAMB_ADDR - IO_BASE,
                 .end    = JMR3927_IOC_NVRAMB_ADDR - IO_BASE + 0x800 - 1,
                 .flags  = IORESOURCE_MEM,
         };
-        struct platform_device *dev;
-        dev = platform_device_register_simple("rtc-ds1742", -1, &res, 1);
-        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+        platform_device_register_simple("rtc-ds1742", -1, &res, 1);
 }
 
 static void __init jmr3927_device_init(void)