* [PATCH] brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame()
@ 2020-05-04 11:33 Jason Yan
2020-05-05 7:50 ` Chi-Hsien Lin
2020-05-06 8:41 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Jason Yan @ 2020-05-04 11:33 UTC (permalink / raw)
To: arend.vanspriel, franky.lin, hante.meuleman, chi-hsien.lin,
wright.feng, kvalo, davem, linux-wireless,
brcm80211-dev-list.pdl, brcm80211-dev-list, netdev, linux-kernel
Cc: Jason Yan
Fix the following coccicheck warning:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1781:9-12:
WARNING: Comparison to bool
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1785:5-8:
WARNING: Comparison to bool
Signed-off-by: Jason Yan <yanaijie@huawei.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 1f5deea5a288..16b193d13a2f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -1777,12 +1777,11 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
}
tx_retry = 0;
- while (!p2p->block_gon_req_tx &&
- (ack == false) && (tx_retry < P2P_AF_TX_MAX_RETRY)) {
+ while (!p2p->block_gon_req_tx && !ack && (tx_retry < P2P_AF_TX_MAX_RETRY)) {
ack = !brcmf_p2p_tx_action_frame(p2p, af_params);
tx_retry++;
}
- if (ack == false) {
+ if (!ack) {
bphy_err(drvr, "Failed to send Action Frame(retry %d)\n",
tx_retry);
clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
--
2.21.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame()
2020-05-04 11:33 [PATCH] brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame() Jason Yan
@ 2020-05-05 7:50 ` Chi-Hsien Lin
2020-05-06 8:41 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Chi-Hsien Lin @ 2020-05-05 7:50 UTC (permalink / raw)
To: Jason Yan, arend.vanspriel, franky.lin, hante.meuleman,
Wright Feng, kvalo, davem, linux-wireless,
brcm80211-dev-list.pdl, brcm80211-dev-list, netdev, linux-kernel
On 05/04/2020 7:33, Jason Yan wrote:
> Fix the following coccicheck warning:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1781:9-12:
> WARNING: Comparison to bool
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1785:5-8:
> WARNING: Comparison to bool
>
> Signed-off-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
> index 1f5deea5a288..16b193d13a2f 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
> @@ -1777,12 +1777,11 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
> }
>
> tx_retry = 0;
> - while (!p2p->block_gon_req_tx &&
> - (ack == false) && (tx_retry < P2P_AF_TX_MAX_RETRY)) {
> + while (!p2p->block_gon_req_tx && !ack && (tx_retry < P2P_AF_TX_MAX_RETRY)) {
> ack = !brcmf_p2p_tx_action_frame(p2p, af_params);
> tx_retry++;
> }
> - if (ack == false) {
> + if (!ack) {
> bphy_err(drvr, "Failed to send Action Frame(retry %d)\n",
> tx_retry);
> clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame()
2020-05-04 11:33 [PATCH] brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame() Jason Yan
2020-05-05 7:50 ` Chi-Hsien Lin
@ 2020-05-06 8:41 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2020-05-06 8:41 UTC (permalink / raw)
To: Jason Yan
Cc: arend.vanspriel, franky.lin, hante.meuleman, chi-hsien.lin,
wright.feng, davem, linux-wireless, brcm80211-dev-list.pdl,
brcm80211-dev-list, netdev, linux-kernel, Jason Yan
Jason Yan <yanaijie@huawei.com> wrote:
> Fix the following coccicheck warning:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1781:9-12:
> WARNING: Comparison to bool
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c:1785:5-8:
> WARNING: Comparison to bool
>
> Signed-off-by: Jason Yan <yanaijie@huawei.com>
> Reviewed-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
Failed to apply, please rebase to top of wireless-drivers-next and send
v2.
Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c'
error: Failed to merge in the changes.
Applying: brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame()
Using index info to reconstruct a base tree...
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
Patch failed at 0001 brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame()
The copy of the patch that failed is found in: .git/rebase-apply/patch
Patch set to Changes Requested.
--
https://patchwork.kernel.org/patch/11525539/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-06 8:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-04 11:33 [PATCH] brcmfmac: remove Comparison to bool in brcmf_p2p_send_action_frame() Jason Yan
2020-05-05 7:50 ` Chi-Hsien Lin
2020-05-06 8:41 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).