serial: tegra: drop bogus NULL tty-port checks

The struct tty_port is part of the uart state and will never be NULL in
the receive helpers. Drop the bogus NULL checks and rename the
pointer-variables "port" to differentiate them from struct tty_struct
pointers (which can be NULL).

Fixes: 962963e4ee23 ("serial: tegra: Switch to using struct tty_port")
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200710135947.2737-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index b3bbee6b6702476b484c0c76f09d86dfc5284683..04d1b0807e664c71248ed2f82b574dbbd0b88a33 100644 (file)
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -635,7 +635,7 @@ static void tegra_uart_handle_tx_pio(struct tegra_uart_port *tup)
 }
 
 static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup,
-               struct tty_port *tty)
+               struct tty_port *port)
 {
        do {
                char flag = TTY_NORMAL;
@@ -659,13 +659,12 @@ static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup,
                if (tup->uport.ignore_status_mask & UART_LSR_DR)
                        continue;
 
-               if (tty)
-                       tty_insert_flip_char(tty, ch, flag);
+               tty_insert_flip_char(port, ch, flag);
        } while (1);
 }
 
 static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
-                                     struct tty_port *tty,
+                                     struct tty_port *port,
                                      unsigned int count)
 {
        int copied;
@@ -675,17 +674,13 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
                return;
 
        tup->uport.icount.rx += count;
-       if (!tty) {
-               dev_err(tup->uport.dev, "No tty port\n");
-               return;
-       }
 
        if (tup->uport.ignore_status_mask & UART_LSR_DR)
                return;
 
        dma_sync_single_for_cpu(tup->uport.dev, tup->rx_dma_buf_phys,
                                count, DMA_FROM_DEVICE);
-       copied = tty_insert_flip_string(tty,
+       copied = tty_insert_flip_string(port,
                        ((unsigned char *)(tup->rx_dma_buf_virt)), count);
        if (copied != count) {
                WARN_ON(1);