diff options
author | Emil Renner Berthing <kernel@esmil.dk> | 2021-01-26 20:15:50 +0300 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2021-02-08 13:37:49 +0300 |
commit | ca04217add8e6c9de96ffb32c4acc8da3fde890f (patch) | |
tree | 79d5bcc7fd81b7a8425c73f82458f4251a5bad74 /drivers/net/wireless/realtek/rtlwifi | |
parent | e7bb4e71ab8da12c7ceec0530de729d9c9189a38 (diff) | |
download | linux-ca04217add8e6c9de96ffb32c4acc8da3fde890f.tar.xz |
rtlwifi: use tasklet_setup to initialize rx_work_tasklet
In commit d3ccc14dfe95 most of the tasklets in this driver was
updated to the new API. However for the rx_work_tasklet only the
type of the callback was changed from
void _rtl_rx_work(unsigned long data)
to
void _rtl_rx_work(struct tasklet_struct *t).
The initialization of rx_work_tasklet was still open-coded and the
function pointer just cast into the old type, and hence nothing sets
rx_work_tasklet.use_callback = true and the callback was still called as
t->func(t->data);
with uninitialized/zero t->data.
Commit 6b8c7574a5f8 changed the casting of _rtl_rx_work a bit and
initialized t->data to a pointer to the tasklet cast to an unsigned
long.
This way calling t->func(t->data) might actually work through all the
casting, but it still doesn't update the code to use the new tasklet
API.
Let's use the new tasklet_setup to initialize rx_work_tasklet properly
and set rx_work_tasklet.use_callback = true so that the callback is
called as
t->callback(t);
without all the casting.
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210126171550.3066-1-kernel@esmil.dk
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi')
-rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c index d62b87f010c9..6c5e242b1bc5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.c +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c @@ -310,8 +310,7 @@ static int _rtl_usb_init_rx(struct ieee80211_hw *hw) init_usb_anchor(&rtlusb->rx_cleanup_urbs); skb_queue_head_init(&rtlusb->rx_queue); - rtlusb->rx_work_tasklet.func = (void(*))_rtl_rx_work; - rtlusb->rx_work_tasklet.data = (unsigned long)&rtlusb->rx_work_tasklet; + tasklet_setup(&rtlusb->rx_work_tasklet, _rtl_rx_work); return 0; } |