]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
b43legacy: Fix -Wcast-function-type
authorPhong Tran <tranmanphong@gmail.com>
Tue, 26 Nov 2019 17:55:26 +0000 (00:55 +0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 7 Apr 2020 08:50:00 +0000 (10:50 +0200)
BugLink: https://bugs.launchpad.net/bugs/1867837
[ Upstream commit 475eec112e4267232d10f4afe2f939a241692b6c ]

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/wireless/broadcom/b43legacy/main.c

index f1e3dad576292ef5b8e2f03a01a8c185c927a101..f435bd0f8b5b5efba00f8a7c17c4b18323d3987e 100644 (file)
@@ -1304,8 +1304,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;
@@ -3775,7 +3776,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;