brcmsmac: make return of 0 explicit
PATCH v2 12/13 brcmsmac: make return of 0 explicit
From: Julia Lawall <[email protected]>
Delete unnecessary local variable whose value is always 0 and that hides the fact that the result is always 0.
A simplified version of the semantic patch that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@r exists@
local idexpression ret;
expression e;
position p;
@@
-ret = 0;
... when != ret = e
return
- ret
+ 0
;
// </smpl>
---
Hi Julia,
Thanks for running this over brcmsmac driver. I took it a step further. So this replaces your patch with Message-ID:
<[email protected]>
Regards,
Arend
--- drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/net/wireless/brcm80211/brcmsmac/main.c +4 -9
@@ -4870,14 +4870,11 @@ static void brcms_c_detach_module(struct brcms_c_info *wlc)/* * low level detach */ -static int brcms_b_detach (struct brcms_c_info *wlc) +static void brcms_b_detach (struct brcms_c_info *wlc) {uint i;struct brcms_hw_band *band;struct brcms_hardware *wlc_hw = wlc->hw; -int callbacks; - - callbacks =0 ;brcms_b_detach_dmapio (wlc_hw);
@@ -4900,9 +4897,6 @@ static int brcms_b_detach(struct brcms_c_info *wlc)ai_detach (wlc_hw->sih); wlc_hw->sih =NULL ; } - -return callbacks; - }/*
@@ -4917,14 +4911,15 @@ static int brcms_b_detach(struct brcms_c_info *wlc)*/ uint brcms_c_detach (struct brcms_c_info *wlc) { -uint callbacks =0 ; +uint callbacks;if (wlc ==NULL )return 0 ; - callbacks +=brcms_b_detach (wlc); +brcms_b_detach (wlc);/* delete software timers */ + callbacks =0 ;if (!brcms_c_radio_monitor_stop (wlc)) callbacks++;
Signature · 1 line
1.8.2.1
Quoted 26 lines · Arend van Spriel
From: Julia Lawall <[email protected]>
Delete unnecessary local variable whose value is always 0 and that hides the fact that the result is always 0.
A simplified version of the semantic patch that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)// <smpl>
@r exists@
local idexpression ret;
expression e;
position p;
@@-ret = 0;
... when != ret = e
return
- ret
+ 0
;
// </smpl>Signed-off-by Julia Lawall <[email protected]>[[email protected]: make brcms_b_detach() a void function]Signed-off-by Arend van Spriel <[email protected]>
Quoted 6 lines
---
Hi Julia,Thanks for running this over brcmsmac driver. I took it a step further. So this replaces your patch with Message-ID:
<[email protected]>
OK, thanks.
julia
Quoted 58 lines
Regards,
Arend--- drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/net/wireless/brcm80211/brcmsmac/main.c +4
-10@@ -4870,14 +4870,11 @@ static void brcms_c_detach_module(struct brcms_c_info *wlc)/* * low level detach */ -static int brcms_b_detach (struct brcms_c_info *wlc) +static void brcms_b_detach (struct brcms_c_info *wlc) {uint i;struct brcms_hw_band *band;struct brcms_hardware *wlc_hw = wlc->hw; -int callbacks; - - callbacks =0 ;brcms_b_detach_dmapio (wlc_hw);@@ -4900,9 +4897,6 @@ static int brcms_b_detach(struct brcms_c_info *wlc)ai_detach (wlc_hw->sih); wlc_hw->sih =NULL ; } - -return callbacks; - }/* @@ -4917,14 +4911,15 @@ static int brcms_b_detach(struct brcms_c_info *wlc)*/ uint brcms_c_detach (struct brcms_c_info *wlc) { -uint callbacks =0 ; +uint callbacks;if (wlc ==NULL )return 0 ; - callbacks +=brcms_b_detach (wlc); +brcms_b_detach (wlc);/* delete software timers */ + callbacks =0 ;if (!brcms_c_radio_monitor_stop (wlc)) callbacks++; --1.8.2.1