Commit 427a06be authored by Allen Pais's avatar Allen Pais Committed by Kalle Valo

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: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <allen.lkml@gmail.com>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200817090637.26887-8-allen.cryptic@gmail.com
parent fc672230
...@@ -981,11 +981,11 @@ static const struct ieee80211_ops brcms_ops = { ...@@ -981,11 +981,11 @@ static const struct ieee80211_ops brcms_ops = {
.set_tim = brcms_ops_beacon_set_tim, .set_tim = brcms_ops_beacon_set_tim,
}; };
void brcms_dpc(unsigned long data) void brcms_dpc(struct tasklet_struct *t)
{ {
struct brcms_info *wl; struct brcms_info *wl;
wl = (struct brcms_info *) data; wl = from_tasklet(wl, t, tasklet);
spin_lock_bh(&wl->lock); spin_lock_bh(&wl->lock);
...@@ -1148,7 +1148,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev) ...@@ -1148,7 +1148,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
init_waitqueue_head(&wl->tx_flush_wq); init_waitqueue_head(&wl->tx_flush_wq);
/* setup the bottom half handler */ /* 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->lock);
spin_lock_init(&wl->isr_lock); spin_lock_init(&wl->isr_lock);
......
...@@ -106,7 +106,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl, ...@@ -106,7 +106,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
void brcms_free_timer(struct brcms_timer *timer); void brcms_free_timer(struct brcms_timer *timer);
void brcms_add_timer(struct brcms_timer *timer, uint ms, int periodic); void brcms_add_timer(struct brcms_timer *timer, uint ms, int periodic);
bool brcms_del_timer(struct brcms_timer *timer); 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_timer(struct brcms_timer *t);
void brcms_fatal_error(struct brcms_info *wl); void brcms_fatal_error(struct brcms_info *wl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment