brcmsmac: convert tasklets to use new tasklet_setup() API

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200817090637.26887-8-allen.cryptic@gmail.com

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
index 29a834ea45eb8b3ed0d57e9ac5d374250bee30b8..818e523f6025d97cc9ac391cb6cb972e1fd9195f 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
@@ -981,11 +981,11 @@ static const struct ieee80211_ops brcms_ops = {
        .set_tim = brcms_ops_beacon_set_tim,
 };
 
-void brcms_dpc(unsigned long data)
+void brcms_dpc(struct tasklet_struct *t)
 {
        struct brcms_info *wl;
 
-       wl = (struct brcms_info *) data;
+       wl = from_tasklet(wl, t, tasklet);
 
        spin_lock_bh(&wl->lock);
 
@@ -1148,7 +1148,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
        init_waitqueue_head(&wl->tx_flush_wq);
 
        /* setup the bottom half handler */
-       tasklet_init(&wl->tasklet, brcms_dpc, (unsigned long) wl);
+       tasklet_setup(&wl->tasklet, brcms_dpc);
 
        spin_lock_init(&wl->lock);
        spin_lock_init(&wl->isr_lock);

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h
index 198053dfc3102ccb17a12b051372d84ff720a32e..eaf926a96a884d849f9ad9eeecb7d52b3c9047eb 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h
@@ -106,7 +106,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
 void brcms_free_timer(struct brcms_timer *timer);
 void brcms_add_timer(struct brcms_timer *timer, uint ms, int periodic);
 bool brcms_del_timer(struct brcms_timer *timer);
-void brcms_dpc(unsigned long data);
+void brcms_dpc(struct tasklet_struct *t);
 void brcms_timer(struct brcms_timer *t);
 void brcms_fatal_error(struct brcms_info *wl);