diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-10-12 20:51:11 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:16 -0400 |
| commit | be69c4ef462a476523f89c74e7db29f6ad207a1a (patch) | |
| tree | 0223292c3512608c1d1c5694372b0f1f2e1ebb6c /drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |
| parent | 55182e4adfffa808a1d07a515637c05c67028a5f (diff) | |
brcm80211: smac: removed redundant timer function parameters
Parameter 'wl' is already stored in struct brcms_timer, so the number of
function parameters could be decreased.
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 4dcf9ef72884..b665aafe19a9 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -1478,12 +1478,12 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl, * * precondition: perimeter lock has been acquired */ -void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *t, uint ms, +void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic) { #ifdef BCMDBG if (t->set) - wiphy_err(wl->wiphy, "%s: Already set. Name: %s, per %d\n", + wiphy_err(t->wl->wiphy, "%s: Already set. Name: %s, per %d\n", __func__, t->name, periodic); #endif @@ -1492,7 +1492,7 @@ void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *t, uint ms, t->set = true; t->timer.expires = jiffies + ms * HZ / 1000; - atomic_inc(&wl->callbacks); + atomic_inc(&t->wl->callbacks); add_timer(&t->timer); } @@ -1501,14 +1501,14 @@ void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *t, uint ms, * * precondition: perimeter lock has been acquired */ -bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *t) +bool brcms_del_timer(struct brcms_timer *t) { if (t->set) { t->set = false; if (!del_timer(&t->timer)) return false; - atomic_dec(&wl->callbacks); + atomic_dec(&t->wl->callbacks); } return true; @@ -1517,12 +1517,13 @@ bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *t) /* * precondition: perimeter lock has been acquired */ -void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *t) +void brcms_free_timer(struct brcms_timer *t) { + struct brcms_info *wl = t->wl; struct brcms_timer *tmp; /* delete the timer in case it is active */ - brcms_del_timer(wl, t); + brcms_del_timer(t); if (wl->timers == t) { wl->timers = wl->timers->next; |