Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sourav Poddar and committed by
Greg Kroah-Hartman
cf0ebee0 f722406f

+7 -16
-10
drivers/tty/serial/mpc52xx_uart.c
··· 84 84 static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id); 85 85 static 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 88 /* PSC fifo operations for isolating differences between 52xx and 512x */ 99 89 /* ======================================================================== */
-6
drivers/tty/serial/serial_core.c
··· 50 50 51 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 - 59 53 static void uart_change_speed(struct tty_struct *tty, struct uart_state *state, 60 54 struct ktermios *old_termios); 61 55 static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
+7
include/linux/serial_core.h
··· 31 31 #include <linux/sysrq.h> 32 32 #include <uapi/linux/serial_core.h> 33 33 34 + #ifdef CONFIG_SERIAL_CORE_CONSOLE 35 + #define uart_console(port) \ 36 + ((port)->cons && (port)->cons->index == (port)->line) 37 + #else 38 + #define uart_console(port) (0) 39 + #endif 40 + 34 41 struct uart_port; 35 42 struct serial_struct; 36 43 struct device;