| Message ID | 20191126175529.10909-2-tranmanphong@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 475eec112e4267232d10f4afe2f939a241692b6c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wireless: Fix -Wcast-function-type | expand |
On Wed, Nov 27, 2019 at 12:55:26AM +0700, Phong Tran wrote: > correct usage prototype of callback in tasklet_init(). > Report by https://github.com/KSPP/linux/issues/20 > > Tested-by: Larry Finger <Larry.Finger@lwfinger.net> > Signed-off-by: Phong Tran <tranmanphong@gmail.com> Thanks for sending these! Reviewed-by: Kees Cook <keescook@chromium.org> -Kees > --- > drivers/net/wireless/broadcom/b43legacy/main.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c > index 4325e91736eb..8b6b657c4b85 100644 > --- a/drivers/net/wireless/broadcom/b43legacy/main.c > +++ b/drivers/net/wireless/broadcom/b43legacy/main.c > @@ -1275,8 +1275,9 @@ static void handle_irq_ucode_debug(struct b43legacy_wldev *dev) > } > > /* Interrupt handler bottom-half */ > -static void b43legacy_interrupt_tasklet(struct b43legacy_wldev *dev) > +static void b43legacy_interrupt_tasklet(unsigned long data) > { > + struct b43legacy_wldev *dev = (struct b43legacy_wldev *)data; > u32 reason; > u32 dma_reason[ARRAY_SIZE(dev->dma_reason)]; > u32 merged_dma_reason = 0; > @@ -3741,7 +3742,7 @@ static int b43legacy_one_core_attach(struct ssb_device *dev, > b43legacy_set_status(wldev, B43legacy_STAT_UNINIT); > wldev->bad_frames_preempt = modparam_bad_frames_preempt; > tasklet_init(&wldev->isr_tasklet, > - (void (*)(unsigned long))b43legacy_interrupt_tasklet, > + b43legacy_interrupt_tasklet, > (unsigned long)wldev); > if (modparam_pio) > wldev->__using_pio = true; > -- > 2.20.1 >
Phong Tran <tranmanphong@gmail.com> wrote: > correct usage prototype of callback in tasklet_init(). > Report by https://github.com/KSPP/linux/issues/20 > > Tested-by: Larry Finger <Larry.Finger@lwfinger.net> > Signed-off-by: Phong Tran <tranmanphong@gmail.com> > Reviewed-by: Kees Cook <keescook@chromium.org> 4 patches applied to wireless-drivers-next.git, thanks. 475eec112e42 b43legacy: Fix -Wcast-function-type ebd77feb27e9 ipw2x00: Fix -Wcast-function-type da5e57e8a6a3 iwlegacy: Fix -Wcast-function-type cb775c88da5d rtlwifi: rtl_pci: Fix -Wcast-function-type
diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c index 4325e91736eb..8b6b657c4b85 100644 --- a/drivers/net/wireless/broadcom/b43legacy/main.c +++ b/drivers/net/wireless/broadcom/b43legacy/main.c @@ -1275,8 +1275,9 @@ static void handle_irq_ucode_debug(struct b43legacy_wldev *dev) } /* Interrupt handler bottom-half */ -static void b43legacy_interrupt_tasklet(struct b43legacy_wldev *dev) +static void b43legacy_interrupt_tasklet(unsigned long data) { + struct b43legacy_wldev *dev = (struct b43legacy_wldev *)data; u32 reason; u32 dma_reason[ARRAY_SIZE(dev->dma_reason)]; u32 merged_dma_reason = 0; @@ -3741,7 +3742,7 @@ static int b43legacy_one_core_attach(struct ssb_device *dev, b43legacy_set_status(wldev, B43legacy_STAT_UNINIT); wldev->bad_frames_preempt = modparam_bad_frames_preempt; tasklet_init(&wldev->isr_tasklet, - (void (*)(unsigned long))b43legacy_interrupt_tasklet, + b43legacy_interrupt_tasklet, (unsigned long)wldev); if (modparam_pio) wldev->__using_pio = true;