evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlegacy: Fix -Wcast-function-type

Browse source 
[ 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>
This commit is contained in:
Phong Tran 2019-11-27 00:55:28 +07:00 • committed by Greg Kroah-Hartman
parent 2f8f9f7798
commit 07d5c2dbc2
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/wireless/iwlegacy/3945-mac.c
View file

@ -1399,8 +1399,9 @@ il3945_dump_nic_error_log(struct il_priv *il)
} }
static void 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, handled = 0;
u32 inta_fh; u32 inta_fh;
unsigned long flags; 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); setup_timer(&il->watchdog, il_bg_watchdog, (unsigned long)il);
tasklet_init(&il->irq_tasklet, tasklet_init(&il->irq_tasklet,
(void (*)(unsigned long))il3945_irq_tasklet, il3945_irq_tasklet,
(unsigned long)il); (unsigned long)il);
} }

5
drivers/net/wireless/iwlegacy/4965-mac.c
View file

@ -4361,8 +4361,9 @@ il4965_synchronize_irq(struct il_priv *il)
} }
static void static void
il4965_irq_tasklet(struct il_priv *il) il4965_irq_tasklet(unsigned long data)
{ {
struct il_priv *il = (struct il_priv *)data;
u32 inta, handled = 0; u32 inta, handled = 0;
u32 inta_fh; u32 inta_fh;
unsigned long flags; unsigned long flags;
@ -6257,7 +6258,7 @@ il4965_setup_deferred_work(struct il_priv *il)
setup_timer(&il->watchdog, il_bg_watchdog, (unsigned long)il); setup_timer(&il->watchdog, il_bg_watchdog, (unsigned long)il);
tasklet_init(&il->irq_tasklet, tasklet_init(&il->irq_tasklet,
(void (*)(unsigned long))il4965_irq_tasklet, il4965_irq_tasklet,
(unsigned long)il); (unsigned long)il);
} }