]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Mar 2020 20:36:56 +0000 (13:36 -0700)
commit7395f62d95aafacdb9bd4996ec2f95b4a655d7e6
treeedc89c04527f05243f26540833dfea691ae73301
parentf2df8ce148fc6af6944978a3876593ef6c40994c
dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom

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 3c68b8fffb48 ("dpaa_eth: FMan erratum A050385
workaround") even though it appears to have been an issue since the
introductory commit 9ad1a3749333 ("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>
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c