| From b663ba9588c3c98ed81a119687b7aabc4515a710 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Mon, 24 Sep 2018 15:17:03 -0700 |
| Subject: qed: Avoid constant logical operation warning in qed_vf_pf_acquire |
| |
| [ Upstream commit 1c492a9d55ba99079210ed901dd8a5423f980487 ] |
| |
| Clang warns when a constant is used in a boolean context as it thinks a |
| bitwise operation may have been intended. |
| |
| drivers/net/ethernet/qlogic/qed/qed_vf.c:415:27: warning: use of logical |
| '&&' with constant operand [-Wconstant-logical-operand] |
| if (!p_iov->b_pre_fp_hsi && |
| ^ |
| drivers/net/ethernet/qlogic/qed/qed_vf.c:415:27: note: use '&' for a |
| bitwise operation |
| if (!p_iov->b_pre_fp_hsi && |
| ^~ |
| & |
| drivers/net/ethernet/qlogic/qed/qed_vf.c:415:27: note: remove constant |
| to silence this warning |
| if (!p_iov->b_pre_fp_hsi && |
| ~^~ |
| 1 warning generated. |
| |
| This has been here since commit 1fe614d10f45 ("qed: Relax VF firmware |
| requirements") and I am not entirely sure why since 0 isn't a special |
| case. Just remove the statement causing Clang to warn since it isn't |
| required. |
| |
| Link: https://github.com/ClangBuiltLinux/linux/issues/126 |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/qlogic/qed/qed_vf.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/qlogic/qed/qed_vf.c b/drivers/net/ethernet/qlogic/qed/qed_vf.c |
| index faf8215872de..9cc02b94328a 100644 |
| --- a/drivers/net/ethernet/qlogic/qed/qed_vf.c |
| +++ b/drivers/net/ethernet/qlogic/qed/qed_vf.c |
| @@ -295,7 +295,6 @@ static int qed_vf_pf_acquire(struct qed_hwfn *p_hwfn) |
| } |
| |
| if (!p_iov->b_pre_fp_hsi && |
| - ETH_HSI_VER_MINOR && |
| (resp->pfdev_info.minor_fp_hsi < ETH_HSI_VER_MINOR)) { |
| DP_INFO(p_hwfn, |
| "PF is using older fastpath HSI; %02x.%02x is configured\n", |
| -- |
| 2.17.1 |
| |
