| From 0d7a36401b6389cd152c7742700f3e9558063ce1 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Tue, 10 Mar 2020 15:06:54 -0700 |
| Subject: [PATCH] dpaa_eth: Remove unnecessary boolean expression in |
| dpaa_get_headroom |
| |
| commit 7395f62d95aafacdb9bd4996ec2f95b4a655d7e6 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| index 2ee645d5e4bd..1315cc42c88f 100644 |
| --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| @@ -2770,9 +2770,7 @@ static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl) |
| headroom = (u16)(bl->priv_data_size + DPAA_PARSE_RESULTS_SIZE + |
| DPAA_TIME_STAMP_SIZE + DPAA_HASH_RESULTS_SIZE); |
| |
| - return DPAA_FD_DATA_ALIGNMENT ? ALIGN(headroom, |
| - DPAA_FD_DATA_ALIGNMENT) : |
| - headroom; |
| + return ALIGN(headroom, DPAA_FD_DATA_ALIGNMENT); |
| } |
| |
| static int dpaa_eth_probe(struct platform_device *pdev) |
| -- |
| 2.7.4 |
| |