brcmsmac: make return of 0 explicit
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 19 May 2014 08:29:29 +0000 (10:29 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 May 2014 20:42:15 +0000 (16:42 -0400)
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>
drivers/net/wireless/brcm80211/brcmsmac/main.c

index 9417cb5a2553f70fc2d2733f80c65d61477dc185..af8ba64ace39286e3214d69bfc23f776e66b6336 100644 (file)
@@ -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++;