lkml.org 
[lkml]   [2013]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 1/5] driver: tty: serial: Move "uart_console" def to core header file.
    Date
    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: Felipe Balbi <balbi@ti.com>
    Cc: Rajendra nayak <rnayak@ti.com>
    Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
    ---
    drivers/tty/serial/mpc52xx_uart.c | 10 ----------
    drivers/tty/serial/serial_core.c | 6 ------
    include/linux/serial_core.h | 7 +++++++
    3 files changed, 7 insertions(+), 16 deletions(-)

    diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
    index 018bad9..d74ac06 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);
    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 */
    /* ======================================================================== */
    diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
    index a400002..b5f74bf 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;

    #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);
    diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
    index 87d4bbc..b98291a 100644
    --- a/include/linux/serial_core.h
    +++ b/include/linux/serial_core.h
    @@ -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;
    --
    1.7.1


    \
     
     \ /
      Last update: 2013-04-22 16:21    [W:4.079 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site