[PATCH v2 1/1] serial: core: Drop duplicate NULL check in uart_*shutdown()

From: Andy Shevchenko
Date: Fri Feb 04 2022 - 10:27:59 EST


The free_page(addr), which becomes free_pages(addr, 0) checks addr
against 0. No need to repeat this check in the callers.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Acked-by: Jiri Slaby <jirislaby@xxxxxxxxxx>
---
v2: rebased on top of tty-next (Greg), added tag (Jiri)
drivers/tty/serial/serial_core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index ba4baa756d51..846192a7b4bf 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -317,8 +317,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
state->xmit.buf = NULL;
uart_port_unlock(uport, flags);

- if (xmit_buf)
- free_page((unsigned long)xmit_buf);
+ free_page((unsigned long)xmit_buf);
}

/**
@@ -1569,8 +1568,7 @@ static void uart_tty_port_shutdown(struct tty_port *port)
state->xmit.buf = NULL;
spin_unlock_irq(&uport->lock);

- if (buf)
- free_page((unsigned long)buf);
+ free_page((unsigned long)buf);

uart_change_pm(state, UART_PM_STATE_OFF);
}
--
2.34.1