summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@codeaurora.org>2018-05-03 14:14:35 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-14 13:44:55 +0200
commit8e70c47c48d2563cf9c64e9f512668a834c45bf6 (patch)
treea649923835b24b87d36de3eb7f43e7df92ea35f0 /drivers/tty
parent6a10635e90e8cb000e6aa8f1292f5aed4c8369e3 (diff)
downloadop-kernel-dev-8e70c47c48d2563cf9c64e9f512668a834c45bf6.zip
op-kernel-dev-8e70c47c48d2563cf9c64e9f512668a834c45bf6.tar.gz
tty: serial: qcom_geni_serial: Use min3 to find minimum of 3 values
Use min3 helper to calculate the minimum value of 3 variables. Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/qcom_geni_serial.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 9bf0ca7..6c5492e 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -586,11 +586,7 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport)
avail = (port->tx_fifo_depth - port->tx_wm) * port->tx_bytes_pw;
tail = (xmit->tail + port->xmit_size) & (UART_XMIT_SIZE - 1);
- if (chunk > (UART_XMIT_SIZE - tail))
- chunk = UART_XMIT_SIZE - tail;
- if (chunk > avail)
- chunk = avail;
-
+ chunk = min3((size_t)chunk, (size_t)(UART_XMIT_SIZE - tail), avail);
if (!chunk)
goto out_write_wakeup;
OpenPOWER on IntegriCloud