]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
serial: 8250_port: Remove useless NULL checks
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 30 Aug 2017 14:12:13 +0000 (17:12 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 31 Aug 2017 16:47:31 +0000 (18:47 +0200)
After switching to HR timers for RS485 the NULL checks for the object
inside timer functions become useless.

Remove them to avoid confusion to static analyzers.

Fixes 6e0a5de2136b ("serial: 8250: Use hrtimers for rs485 delays")
Cc: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_port.c

index 4726aa27696824583809ce520324e0452402dfd1..f0cc04f62b676870551e757b8f006b3e3ff4fa4a 100644 (file)
@@ -1450,13 +1450,13 @@ static enum hrtimer_restart serial8250_em485_handle_stop_tx(struct hrtimer *t)
        struct uart_8250_em485 *em485;
        struct uart_8250_port *p;
        unsigned long flags;
+
        em485 = container_of(t, struct uart_8250_em485, stop_tx_timer);
        p = em485->port;
 
        serial8250_rpm_get(p);
        spin_lock_irqsave(&p->port.lock, flags);
-       if (em485 &&
-           em485->active_timer == &em485->stop_tx_timer) {
+       if (em485->active_timer == &em485->stop_tx_timer) {
                __do_stop_tx_rs485(p);
                em485->active_timer = NULL;
        }
@@ -1608,12 +1608,12 @@ static enum hrtimer_restart serial8250_em485_handle_start_tx(struct hrtimer *t)
        struct uart_8250_em485 *em485;
        struct uart_8250_port *p;
        unsigned long flags;
+
        em485 = container_of(t, struct uart_8250_em485, start_tx_timer);
        p = em485->port;
 
        spin_lock_irqsave(&p->port.lock, flags);
-       if (em485 &&
-           em485->active_timer == &em485->start_tx_timer) {
+       if (em485->active_timer == &em485->start_tx_timer) {
                __start_tx(&p->port);
                em485->active_timer = NULL;
        }