Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf0ebee0 authored by Sourav Poddar's avatar Sourav Poddar Committed by Greg Kroah-Hartman
Browse files

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: default avatarFelipe Balbi <balbi@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarSourav Poddar <sourav.poddar@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f722406f

drivers/tty/serial/mpc52xx_uart.c

+0 −10
Original line number Diff line number Diff line
@@ -84,16 +84,6 @@ static void mpc52xx_uart_of_enumerate(void); 
static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);

static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port);





/* Simple macro to test if a port is console or not. This one is taken

 * for serial_core.c and maybe should be moved to serial_core.h ? */

#ifdef CONFIG_SERIAL_CORE_CONSOLE

#define uart_console(port) \

	((port)->cons && (port)->cons->index == (port)->line)

#else

#define uart_console(port)	(0)

#endif



/* ======================================================================== */

/* PSC fifo operations for isolating differences between 52xx and 512x      */

/* ======================================================================== */

drivers/tty/serial/serial_core.c

+0 −6
Original line number Diff line number Diff line
@@ -50,12 +50,6 @@ static struct lock_class_key port_lock_key; 


#define HIGH_BITS_OFFSET	((sizeof(long)-sizeof(int))*8)



#ifdef CONFIG_SERIAL_CORE_CONSOLE

#define uart_console(port)	((port)->cons && (port)->cons->index == (port)->line)

#else

#define uart_console(port)	(0)

#endif



static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,

					struct ktermios *old_termios);

static void uart_wait_until_sent(struct tty_struct *tty, int timeout);

include/linux/serial_core.h

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,13 @@ 
#include <linux/sysrq.h>

#include <uapi/linux/serial_core.h>



#ifdef CONFIG_SERIAL_CORE_CONSOLE

#define uart_console(port) \

	((port)->cons && (port)->cons->index == (port)->line)

#else

#define uart_console(port)      (0)

#endif



struct uart_port;

struct serial_struct;

struct device;