staging: brcm80211: removed watchdog function from softmac

Code cleanup. Watchdog function served no purpose since it had an empty body.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index 7f6a490310fe7522a52262ab4275913c41bc38c7..a4d46dd9245ece7f4fa89d5186402902b43d998e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -61,8 +61,6 @@ static void _brcms_timer(struct brcms_timer *t);
 static int ieee_hw_init(struct ieee80211_hw *hw);
 static int ieee_hw_rate_init(struct ieee80211_hw *hw);
 
-static int wl_linux_watchdog(void *ctx);
-
 /* Flags we support */
 #define MAC_FILTERS (FIF_PROMISC_IN_BSS | \
        FIF_ALLMULTI | \
@@ -828,7 +826,7 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,
        wl->irq = irq;
 
        /* register module */
-       brcms_c_module_register(wl->pub, "linux", wl, wl_linux_watchdog, NULL);
+       brcms_c_module_register(wl->pub, "linux", wl, NULL);
 
        if (ieee_hw_init(hw)) {
                wiphy_err(wl->wiphy, "wl%d: %s: ieee_hw_init failed!\n", unit,
@@ -1701,16 +1699,6 @@ void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *t)
 
 }
 
-/*
- * runs in software irq context
- *
- * precondition: perimeter lock is not acquired
- */
-static int wl_linux_watchdog(void *ctx)
-{
-       return 0;
-}
-
 struct firmware_hdr {
        u32 offset;
        u32 len;

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index d011ed68c712bb2e1c44595dea075214a8d09dff..bdc7fb4d62d7b761a31d7428eb63f663e33309bc 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -5374,12 +5374,6 @@ static void brcms_c_watchdog(void *arg)
                        cfg->tk_cm_bt--;
        END_FOREACH_BSS()
 
-       /* Call any registered watchdog handlers */
-       for (i = 0; i < BRCMS_MAXMODULES; i++) {
-               if (wlc->modulecb[i].watchdog_fn)
-                       wlc->modulecb[i].watchdog_fn(wlc->modulecb[i].hdl);
-       }
-
        if (BRCMS_ISNPHY(wlc->band) && !wlc->pub->tempsense_disable &&
            ((wlc->pub->now - wlc->tempsense_lasttime) >=
             BRCMS_TEMPSENSE_PERIOD)) {
@@ -6325,8 +6319,8 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
  * register watchdog and down handlers.
  */
 int brcms_c_module_register(struct brcms_pub *pub,
-               const char *name, void *hdl,
-               int (*w_fn)(void *handle), int (*d_fn)(void *handle))
+                           const char *name, void *hdl,
+                           int (*d_fn)(void *handle))
 {
        struct brcms_c_info *wlc = (struct brcms_c_info *) pub->wlc;
        int i;
@@ -6337,7 +6331,6 @@ int brcms_c_module_register(struct brcms_pub *pub,
                        strncpy(wlc->modulecb[i].name, name,
                                sizeof(wlc->modulecb[i].name) - 1);
                        wlc->modulecb[i].hdl = hdl;
-                       wlc->modulecb[i].watchdog_fn = w_fn;
                        wlc->modulecb[i].down_fn = d_fn;
                        return 0;
                }

diff --git a/drivers/staging/brcm80211/brcmsmac/main.h b/drivers/staging/brcm80211/brcmsmac/main.h
index 0fd061b02b9c7a108fce6b65af92891683241f8c..e2febe0565af4b883f4ce1765cf8e27b7ba7c3e1 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.h
+++ b/drivers/staging/brcm80211/brcmsmac/main.h
@@ -462,8 +462,6 @@ struct modulecb {
        const struct brcmu_iovar *iovars;
        /* handle passed when handler 'doiovar' is called */
        void *hdl;
-       /* watchdog handler */
-       int (*watchdog_fn)(void *handle);
 
        /* IOVar handler
         *

diff --git a/drivers/staging/brcm80211/brcmsmac/pub.h b/drivers/staging/brcm80211/brcmsmac/pub.h
index bfbb2615bed4e78757721509803869fa401c0bb6..40efee6e62426ee88716567f09ccc608ee7edc03 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/pub.h
+++ b/drivers/staging/brcm80211/brcmsmac/pub.h
@@ -614,9 +614,8 @@ extern void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc);
 extern void brcms_c_mctrl(struct brcms_c_info *wlc, u32 mask, u32 val);
 
 extern int brcms_c_module_register(struct brcms_pub *pub,
-                              const char *name, void *hdl,
-                              int (*watchdog_fn)(void *handle),
-                              int (*down_fn)(void *handle));
+                                  const char *name, void *hdl,
+                                  int (*down_fn)(void *handle));
 
 extern int brcms_c_module_unregister(struct brcms_pub *pub, const char *name,
                                 void *hdl);