Commit 1a5f680d authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed watchdog function from softmac 



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

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a09818cc

drivers/staging/brcm80211/brcmsmac/mac80211_if.c

+1 −13
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/brcmsmac/main.c

+2 −9
Original line number Diff line number Diff line
@@ -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)) {
@@ -6326,7 +6320,7 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len, 
 */

int brcms_c_module_register(struct brcms_pub *pub,

			    const char *name, void *hdl,

		int (*w_fn)(void *handle), int (*d_fn)(void *handle))

			    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;

		}

drivers/staging/brcm80211/brcmsmac/main.h

+0 −2
Original line number Diff line number Diff line
@@ -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

	 *

drivers/staging/brcm80211/brcmsmac/pub.h

+2 −3
Original line number Diff line number Diff line
@@ -615,7 +615,6 @@ 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));



extern int brcms_c_module_unregister(struct brcms_pub *pub, const char *name,