aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorSourav Poddar <sourav.poddar@ti.com>2013-05-15 11:35:37 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:00:49 -0400
commitc842651d3f6516c793bd68136e273bb28e877282 (patch)
tree51b775b1164111da87689f493333891d7f6e5d9a /drivers/tty
parentb9d419dcc1f32b4759902db9b897a9434aa927b4 (diff)
serial: Move "uart_console" def to core header file.
Move "uart_console" definition to serial core header file, so that it can be used by serial drivers. Get rid of the uart_console defintion from mpc52xx_uart driver. Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Rajendra nayak <rnayak@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Reviewed-by: Kevin Hilman <khilman@linaro.org> Tested-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/mpc52xx_uart.c10
-rw-r--r--drivers/tty/serial/serial_core.c6
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index f51b280f3bf2..510fa986cf9e 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -84,16 +84,6 @@ static void mpc52xx_uart_of_enumerate(void);
84static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id); 84static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);
85static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port); 85static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port);
86 86
87
88/* Simple macro to test if a port is console or not. This one is taken
89 * for serial_core.c and maybe should be moved to serial_core.h ? */
90#ifdef CONFIG_SERIAL_CORE_CONSOLE
91#define uart_console(port) \
92 ((port)->cons && (port)->cons->index == (port)->line)
93#else
94#define uart_console(port) (0)
95#endif
96
97/* ======================================================================== */ 87/* ======================================================================== */
98/* PSC fifo operations for isolating differences between 52xx and 512x */ 88/* PSC fifo operations for isolating differences between 52xx and 512x */
99/* ======================================================================== */ 89/* ======================================================================== */
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index f87dbfd32770..28cdd2829139 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -50,12 +50,6 @@ static struct lock_class_key port_lock_key;
50 50
51#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) 51#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
52 52
53#ifdef CONFIG_SERIAL_CORE_CONSOLE
54#define uart_console(port) ((port)->cons && (port)->cons->index == (port)->line)
55#else
56#define uart_console(port) (0)
57#endif
58
59static void uart_change_speed(struct tty_struct *tty, struct uart_state *state, 53static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
60 struct ktermios *old_termios); 54 struct ktermios *old_termios);
61static void uart_wait_until_sent(struct tty_struct *tty, int timeout); 55static void uart_wait_until_sent(struct tty_struct *tty, int timeout);