TTY: switch tty_buffer_request_room to tty_port

[karo-tx-linux.git] / drivers / tty / serial / ucc_uart.c

diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 2ebe606a2db123fb1740baa8064a94b8cb4ca5dc..ed047d9ab1e28d39f709d14dcdc88faa75292477 100644 (file)
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -469,7 +469,8 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port)
        int i;
        unsigned char ch, *cp;
        struct uart_port *port = &qe_port->port;
-       struct tty_struct *tty = port->state->port.tty;
+       struct tty_port *tport = &port->state->port;
+       struct tty_struct *tty = tport->tty;
        struct qe_bd *bdp;
        u16 status;
        unsigned int flg;
@@ -491,7 +492,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port)
                /* If we don't have enough room in RX buffer for the entire BD,
                 * then we try later, which will be the next RX interrupt.
                 */
-               if (tty_buffer_request_room(tty, i) < i) {
+               if (tty_buffer_request_room(tport, i) < i) {
                        dev_dbg(port->dev, "ucc-uart: no room in RX buffer\n");
                        return;
                }
@@ -1360,7 +1361,7 @@ static int ucc_uart_probe(struct platform_device *ofdev)
        }
 
        qe_port->port.irq = irq_of_parse_and_map(np, 0);
-       if (qe_port->port.irq == NO_IRQ) {
+       if (qe_port->port.irq == 0) {
                dev_err(&ofdev->dev, "could not map IRQ for UCC%u\n",
                       qe_port->ucc_num + 1);
                ret = -EINVAL;