summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/intel/iwlegacy/3945-mac.c
diff options
context:
space:
mode:
authorPhong Tran <tranmanphong@gmail.com>2019-11-27 00:55:28 +0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-28 15:42:26 +0100
commit70fce7d89bcd3b07cc3c00fde23b5d59f973c7d0 (patch)
tree097a496f7c2bf6446f3eedc1ed1a0151315bf977 /drivers/net/wireless/intel/iwlegacy/3945-mac.c
parent3b1b4754557a2daaf291879d7e461e0e6406f699 (diff)
iwlegacy: Fix -Wcast-function-type
[ Upstream commit da5e57e8a6a3e69dac2937ba63fa86355628fbb2 ] correct usage prototype of callback in tasklet_init(). Report by https://github.com/KSPP/linux/issues/20 Signed-off-by: Phong Tran <tranmanphong@gmail.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy/3945-mac.c')
-rw-r--r--drivers/net/wireless/intel/iwlegacy/3945-mac.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
index 466912eb2d87..d853ccbf74cb 100644
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
@@ -1399,8 +1399,9 @@ il3945_dump_nic_error_log(struct il_priv *il)
}
static void
-il3945_irq_tasklet(struct il_priv *il)
+il3945_irq_tasklet(unsigned long data)
{
+ struct il_priv *il = (struct il_priv *)data;
u32 inta, handled = 0;
u32 inta_fh;
unsigned long flags;
@@ -3432,7 +3433,7 @@ il3945_setup_deferred_work(struct il_priv *il)
setup_timer(&il->watchdog, il_bg_watchdog, (unsigned long)il);
tasklet_init(&il->irq_tasklet,
- (void (*)(unsigned long))il3945_irq_tasklet,
+ il3945_irq_tasklet,
(unsigned long)il);
}