| Message ID | 20230211154550.2130670-1-trix@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | serial: imx: remove a redundant check | expand |
Tom Rix <trix@redhat.com> writes: > cpp_check reports > drivers/tty/serial/imx.c:1207:15: style: Condition 'r_bytes>0' is always true [knownConditionTrueFalse] > if (r_bytes > 0) { > > r_byte is set to > r_bytes = rx_ring->head - rx_ring->tail; > > The head - tail calculation is also done by the earlier check > if (rx_ring->head <= sg_dma_len(sgl) && > rx_ring->head > rx_ring->tail) { > > so r_bytes will always be > 0, so the second check is not needed. > > Signed-off-by: Tom Rix <trix@redhat.com> > --- > drivers/tty/serial/imx.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 363c77a140f0..523f296d5747 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -1204,11 +1204,9 @@ static void imx_uart_dma_rx_callback(void *data) > r_bytes = rx_ring->head - rx_ring->tail; > > /* If we received something, check for 0xff flood */ > - if (r_bytes > 0) { > - spin_lock(&sport->port.lock); > - imx_uart_check_flood(sport, imx_uart_readl(sport, USR2)); > - spin_unlock(&sport->port.lock); > - } > + spin_lock(&sport->port.lock); > + imx_uart_check_flood(sport, imx_uart_readl(sport, USR2)); > + spin_unlock(&sport->port.lock); > > if (!(sport->port.ignore_status_mask & URXD_DUMMY_READ)) > { Nice catch. Didn't notice this when wrote the check-flood patch, sorry! Thanks, -- Sergey Organov
On 2/11/2023 5:45 PM, Tom Rix wrote: > cpp_check reports > drivers/tty/serial/imx.c:1207:15: style: Condition 'r_bytes>0' is always true [knownConditionTrueFalse] > if (r_bytes > 0) { > > r_byte is set to > r_bytes = rx_ring->head - rx_ring->tail; > > The head - tail calculation is also done by the earlier check > if (rx_ring->head <= sg_dma_len(sgl) && > rx_ring->head > rx_ring->tail) { > > so r_bytes will always be > 0, so the second check is not needed. > > Signed-off-by: Tom Rix <trix@redhat.com> Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com> > --- > drivers/tty/serial/imx.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 363c77a140f0..523f296d5747 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -1204,11 +1204,9 @@ static void imx_uart_dma_rx_callback(void *data) > r_bytes = rx_ring->head - rx_ring->tail; > > /* If we received something, check for 0xff flood */ > - if (r_bytes > 0) { > - spin_lock(&sport->port.lock); > - imx_uart_check_flood(sport, imx_uart_readl(sport, USR2)); > - spin_unlock(&sport->port.lock); > - } > + spin_lock(&sport->port.lock); > + imx_uart_check_flood(sport, imx_uart_readl(sport, USR2)); > + spin_unlock(&sport->port.lock); > > if (!(sport->port.ignore_status_mask & URXD_DUMMY_READ)) { >
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 363c77a140f0..523f296d5747 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1204,11 +1204,9 @@ static void imx_uart_dma_rx_callback(void *data) r_bytes = rx_ring->head - rx_ring->tail; /* If we received something, check for 0xff flood */ - if (r_bytes > 0) { - spin_lock(&sport->port.lock); - imx_uart_check_flood(sport, imx_uart_readl(sport, USR2)); - spin_unlock(&sport->port.lock); - } + spin_lock(&sport->port.lock); + imx_uart_check_flood(sport, imx_uart_readl(sport, USR2)); + spin_unlock(&sport->port.lock); if (!(sport->port.ignore_status_mask & URXD_DUMMY_READ)) {
cpp_check reports drivers/tty/serial/imx.c:1207:15: style: Condition 'r_bytes>0' is always true [knownConditionTrueFalse] if (r_bytes > 0) { r_byte is set to r_bytes = rx_ring->head - rx_ring->tail; The head - tail calculation is also done by the earlier check if (rx_ring->head <= sg_dma_len(sgl) && rx_ring->head > rx_ring->tail) { so r_bytes will always be > 0, so the second check is not needed. Signed-off-by: Tom Rix <trix@redhat.com> --- drivers/tty/serial/imx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)