redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: brcm80211: removed watchdog function from softmac

Browse source 
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>
This commit is contained in:
Roland Vossen 2011-08-08 15:59:02 +02:00 committed by Greg Kroah-Hartman
parent a09818cc6a
commit 1a5f680d7c
4 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
View file

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

11
drivers/staging/brcm80211/brcmsmac/main.c
View file

@ -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;
}

2
drivers/staging/brcm80211/brcmsmac/main.h
View file

@ -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
*

5
drivers/staging/brcm80211/brcmsmac/pub.h
View file

@ -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);