Skip to content

Commit

Permalink
brcmsmac: make return of 0 explicit
Browse files Browse the repository at this point in the history
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 <Julia.Lawall@lip6.fr>
[arend@broadcom.com: make brcms_b_detach() a void function]
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Julia Lawall authored and John W. Linville committed May 19, 2014
1 parent 08232bf commit 20e6f7f
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/net/wireless/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;

}

/*
Expand All @@ -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++;

Expand Down

0 comments on commit 20e6f7f

Please sign in to comment.