Merge patch series "riscv: Introduce compat-mode helpers & improve arch_get_mmap_end()"

[linux-2.6-microblaze.git] / drivers / tty / mxser.c

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 6ce7f25..458bb12 100644 (file)
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -264,7 +264,7 @@ struct mxser_port {
        u8 rx_low_water;
        int type;               /* UART type */
 
-       unsigned char x_char;   /* xon/xoff character */
+       u8 x_char;              /* xon/xoff character */
        u8 IER;                 /* Interrupt Enable Register */
        u8 MCR;                 /* Modem control register */
        u8 FCR;                 /* FIFO control register */
@@ -905,7 +905,7 @@ static ssize_t mxser_write(struct tty_struct *tty, const u8 *buf, size_t count)
 {
        struct mxser_port *info = tty->driver_data;
        unsigned long flags;
-       int written;
+       size_t written;
        bool is_empty;
 
        spin_lock_irqsave(&info->slock, flags);
@@ -1521,7 +1521,7 @@ static u8 mxser_receive_chars_old(struct tty_struct *tty,
                        if (++ignored > 100)
                                break;
                } else {
-                       char flag = 0;
+                       u8 flag = 0;
                        if (status & UART_LSR_BRK_ERROR_BITS) {
                                if (status & UART_LSR_BI) {
                                        flag = TTY_BREAK;
@@ -1585,7 +1585,7 @@ static void mxser_transmit_chars(struct tty_struct *tty, struct mxser_port *port
 
        count = port->xmit_fifo_size;
        do {
-               unsigned char c;
+               u8 c;
 
                if (!kfifo_get(&port->port.xmit_fifo, &c))
                        break;