From a3827250606895ec2dd4b8d867342b7cabf3692f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 14 Sep 2012 23:44:09 +0200 Subject: serial: Remove CONFIG_SERIAL_MULTI from serial drivers Remove the support for not-CONFIG_SERIAL_MULTI part from serial port drivers and some board files. Since CONFIG_SERIAL_MULTI is now enabled by default, that part is a dead code. Remove it. Signed-off-by: Marek Vasut Cc: Marek Vasut Cc: Anatolij Gustschin Cc: Stefan Roese Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc8260/serial_scc.c | 32 -------------------------------- arch/powerpc/cpu/mpc8260/serial_smc.c | 32 -------------------------------- 2 files changed, 64 deletions(-) (limited to 'arch/powerpc/cpu/mpc8260') diff --git a/arch/powerpc/cpu/mpc8260/serial_scc.c b/arch/powerpc/cpu/mpc8260/serial_scc.c index 7bfd420..ab77558 100644 --- a/arch/powerpc/cpu/mpc8260/serial_scc.c +++ b/arch/powerpc/cpu/mpc8260/serial_scc.c @@ -261,7 +261,6 @@ static int mpc8260_scc_serial_tstc(void) return ((rbdf->cbd_sc & BD_SC_EMPTY) == 0); } -#ifdef CONFIG_SERIAL_MULTI static struct serial_device mpc8260_scc_serial_drv = { .name = "mpc8260_scc_uart", .start = mpc8260_scc_serial_init, @@ -282,37 +281,6 @@ __weak struct serial_device *default_serial_console(void) { return &mpc8260_scc_serial_drv; } -#else -int serial_init(void) -{ - return mpc8260_scc_serial_init(); -} - -void serial_setbrg(void) -{ - mpc8260_scc_serial_setbrg(); -} - -void serial_putc(const char c) -{ - mpc8260_scc_serial_putc(c); -} - -void serial_puts(const char *s) -{ - mpc8260_scc_serial_puts(s); -} - -int serial_getc(void) -{ - return mpc8260_scc_serial_getc(); -} - -int serial_tstc(void) -{ - return mpc8260_scc_serial_tstc(); -} -#endif #endif /* CONFIG_CONS_ON_SCC */ #if defined(CONFIG_KGDB_ON_SCC) diff --git a/arch/powerpc/cpu/mpc8260/serial_smc.c b/arch/powerpc/cpu/mpc8260/serial_smc.c index 0f3b834..7edde9a 100644 --- a/arch/powerpc/cpu/mpc8260/serial_smc.c +++ b/arch/powerpc/cpu/mpc8260/serial_smc.c @@ -264,7 +264,6 @@ static int mpc8260_smc_serial_tstc(void) return !(rtx->rxbd.cbd_sc & BD_SC_EMPTY); } -#ifdef CONFIG_SERIAL_MULTI static struct serial_device mpc8260_smc_serial_drv = { .name = "mpc8260_smc_uart", .start = mpc8260_smc_serial_init, @@ -285,37 +284,6 @@ __weak struct serial_device *default_serial_console(void) { return &mpc8260_smc_serial_drv; } -#else -int serial_init(void) -{ - return mpc8260_smc_serial_init(); -} - -void serial_setbrg(void) -{ - mpc8260_smc_serial_setbrg(); -} - -void serial_putc(const char c) -{ - mpc8260_smc_serial_putc(c); -} - -void serial_puts(const char *s) -{ - mpc8260_smc_serial_puts(s); -} - -int serial_getc(void) -{ - return mpc8260_smc_serial_getc(); -} - -int serial_tstc(void) -{ - return mpc8260_smc_serial_tstc(); -} -#endif #endif /* CONFIG_CONS_ON_SMC */ #if defined(CONFIG_KGDB_ON_SMC) -- cgit v1.1