[PATCH] MIPS: txx9: remove forced serial console setting

[PATCH] MIPS: txx9: remove forced serial console setting

[Yoichi Yuasa]

It is not always used, even if it is available.

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/include/asm/txx9/generic.h |    1 -
 arch/mips/txx9/generic/setup.c       |    5 -----
 arch/mips/txx9/jmr3927/setup.c       |    7 -------
 arch/mips/txx9/rbtx4927/setup.c      |    7 -------
 arch/mips/txx9/rbtx4938/setup.c      |    6 ------
 5 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/arch/mips/include/asm/txx9/generic.h b/arch/mips/include/asm/txx9/generic.h
index 827dc22..64887d3 100644
--- a/arch/mips/include/asm/txx9/generic.h
+++ b/arch/mips/include/asm/txx9/generic.h
@@ -42,7 +42,6 @@ struct txx9_board_vec {
 };
 extern struct txx9_board_vec *txx9_board_vec;
 extern int (*txx9_irq_dispatch)(int pending);
-char *prom_getcmdline(void);
 const char *prom_getenv(const char *name);
 void txx9_wdt_init(unsigned long base);
 void txx9_wdt_now(unsigned long base);
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index e27809b..7174d83 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -399,11 +399,6 @@ const char *get_system_type(void)
 	return txx9_system_type;
 }
 
-char * __init prom_getcmdline(void)
-{
-	return &(arcs_cmdline[0]);
-}
-
 const char *__init prom_getenv(const char *name)
 {
 	const s32 *str;
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 25e50a7..3206f76 100644
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -67,8 +67,6 @@ static void jmr3927_board_init(void);
 
 static void __init jmr3927_mem_setup(void)
 {
-	char *argptr;
-
 	set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);
 
 	_machine_restart = jmr3927_machine_restart;
@@ -97,11 +95,6 @@ static void __init jmr3927_mem_setup(void)
 	jmr3927_board_init();
 
 	tx3927_sio_init(0, 1 << 1); /* ch1: noCTS */
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
-	argptr = prom_getcmdline();
-	if (!strstr(argptr, "console="))
-		strcat(argptr, " console=ttyS1,115200");
-#endif
 }
 
 static void __init jmr3927_pci_setup(void)
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index ee468ea..b15adfc 100644
--- a/arch/mips/txx9/rbtx4927/setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -187,8 +187,6 @@ static void __init rbtx4937_clock_init(void);
 
 static void __init rbtx4927_mem_setup(void)
 {
-	char *argptr;
-
 	if (TX4927_REV_PCODE() == 0x4927) {
 		rbtx4927_clock_init();
 		tx4927_setup();
@@ -213,11 +211,6 @@ static void __init rbtx4927_mem_setup(void)
 	gpio_direction_output(15, 1);
 
 	tx4927_sio_init(0, 0);
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
-	argptr = prom_getcmdline();
-	if (!strstr(argptr, "console="))
-		strcat(argptr, " console=ttyS0,38400");
-#endif
 }
 
 static void __init rbtx4927_clock_init(void)
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index d66509b..d6e70da 100644
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -153,7 +153,6 @@ static void __init rbtx4938_time_init(void)
 static void __init rbtx4938_mem_setup(void)
 {
 	unsigned long long pcfg;
-	char *argptr;
 
 	if (txx9_master_clock == 0)
 		txx9_master_clock = 25000000; /* 25MHz */
@@ -168,11 +167,6 @@ static void __init rbtx4938_mem_setup(void)
 #endif
 
 	tx4938_sio_init(7372800, 0);
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
-	argptr = prom_getcmdline();
-	if (!strstr(argptr, "console="))
-		strcat(argptr, " console=ttyS0,38400");
-#endif
 
 #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
 	pr_info("PIOSEL: disabling both ATA and NAND selection\n");
-- 
1.6.6.1

Re: [PATCH] MIPS: txx9: remove forced serial console setting

[Atsushi Nemoto]

On Tue, 2 Feb 2010 18:40:04 +0900, Yoichi Yuasa <yuasa@linux-mips.org> wrote:
> It is not always used, even if it is available.
> 
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> ---
>  arch/mips/include/asm/txx9/generic.h |    1 -
>  arch/mips/txx9/generic/setup.c       |    5 -----
>  arch/mips/txx9/jmr3927/setup.c       |    7 -------
>  arch/mips/txx9/rbtx4927/setup.c      |    7 -------
>  arch/mips/txx9/rbtx4938/setup.c      |    6 ------
>  5 files changed, 0 insertions(+), 26 deletions(-)

Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>

Re: [PATCH] MIPS: txx9: remove forced serial console setting

[Ralf Baechle]

On Tue, Feb 02, 2010 at 11:41:50PM +0900, Atsushi Nemoto wrote:

> On Tue, 2 Feb 2010 18:40:04 +0900, Yoichi Yuasa <yuasa@linux-mips.org> wrote:
> > It is not always used, even if it is available.
> > 
> > Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> > ---
> >  arch/mips/include/asm/txx9/generic.h |    1 -
> >  arch/mips/txx9/generic/setup.c       |    5 -----
> >  arch/mips/txx9/jmr3927/setup.c       |    7 -------
> >  arch/mips/txx9/rbtx4927/setup.c      |    7 -------
> >  arch/mips/txx9/rbtx4938/setup.c      |    6 ------
> >  5 files changed, 0 insertions(+), 26 deletions(-)
> 
> Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>

Thanks, queued for 2.6.34.

  Ralf