]> git.baikalelectronics.ru Git - kernel.git/commit
dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom
authorNathan Chancellor <natechancellor@gmail.com>
Tue, 10 Mar 2020 22:06:54 +0000 (15:06 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Apr 2020 09:01:55 +0000 (11:01 +0200)
commit29ad07cb00463377334d8678d99b90675c92f10a
treee70a526a317f8c3760adbfe3958349919e000d75
parent3436804fc4a4d685e0076ccf289943edb11b4a77
dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom

[ Upstream commit a9afdab6fadaa4ae6dfdbcc278ccb3bd70abef96 ]

Clang warns:

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2860:9: warning:
converting the result of '?:' with integer constants to a boolean always
evaluates to 'true' [-Wtautological-constant-compare]
        return DPAA_FD_DATA_ALIGNMENT ? ALIGN(headroom,
               ^
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:131:34: note: expanded
from macro 'DPAA_FD_DATA_ALIGNMENT'
\#define DPAA_FD_DATA_ALIGNMENT  (fman_has_errata_a050385() ? 64 : 16)
                                 ^
1 warning generated.

This was exposed by commit d8a2496fa90f ("dpaa_eth: FMan erratum A050385
workaround") even though it appears to have been an issue since the
introductory commit d3429da5cb8e ("dpaa_eth: add support for DPAA
Ethernet") since DPAA_FD_DATA_ALIGNMENT has never been able to be zero.

Just replace the whole boolean expression with the true branch, as it is
always been true.

Link: https://github.com/ClangBuiltLinux/linux/issues/928
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c