Re: [PATCH 06/15] tty: serial: qcom-geni-serial: refactor qcom_geni_serial_isr()

Konrad Dybcio
2022-11-18T13:24:07Z

On 18/11/2022 13:25, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> Simplify the conditions in qcom_geni_serial_isr() and fix indentation.
>
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
> drivers/tty/serial/qcom_geni_serial.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
> index dd1491a72deb..22c1869c60f4 100644
> --- a/drivers/tty/serial/qcom_geni_serial.c
> +++ b/drivers/tty/serial/qcom_geni_serial.c
> @@ -824,20 +824,18 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *dev)
>
> if (m_irq_status & m_irq_en & (M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN))
> qcom_geni_serial_handle_tx(uport, m_irq_status & M_CMD_DONE_EN,
> - geni_status & M_GENI_CMD_ACTIVE);
> + geni_status & M_GENI_CMD_ACTIVE);
>
> - if (s_irq_status & S_GP_IRQ_0_EN || s_irq_status & S_GP_IRQ_1_EN) {
> + if (s_irq_status & (S_GP_IRQ_0_EN | S_GP_IRQ_1_EN)) {
> if (s_irq_status & S_GP_IRQ_0_EN)
> uport->icount.parity++;
> drop_rx = true;
> - } else if (s_irq_status & S_GP_IRQ_2_EN ||
> - s_irq_status & S_GP_IRQ_3_EN) {
> + } else if (s_irq_status & (S_GP_IRQ_2_EN | S_GP_IRQ_3_EN)) {
> uport->icount.brk++;
> port->brk = true;
> }
>
> - if (s_irq_status & S_RX_FIFO_WATERMARK_EN ||
> - s_irq_status & S_RX_FIFO_LAST_EN)
> + if (s_irq_status & (S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN))
> qcom_geni_serial_handle_rx(uport, drop_rx);
>