| From b621f7f253bf17cfe0ad9328192914d26353f2e8 Mon Sep 17 00:00:00 2001 |
| From: Phong Tran <tranmanphong@gmail.com> |
| Date: Wed, 27 Nov 2019 00:55:29 +0700 |
| Subject: [PATCH] rtlwifi: rtl_pci: Fix -Wcast-function-type |
| |
| commit cb775c88da5d48a85d99d95219f637b6fad2e0e9 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c |
| index 05050f6c36db..d651b8bfde47 100644 |
| --- a/drivers/net/wireless/realtek/rtlwifi/pci.c |
| +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c |
| @@ -1061,13 +1061,15 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id) |
| return ret; |
| } |
| |
| -static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw) |
| +static void _rtl_pci_irq_tasklet(unsigned long data) |
| { |
| + struct ieee80211_hw *hw = (struct ieee80211_hw *)data; |
| _rtl_pci_tx_chk_waitq(hw); |
| } |
| |
| -static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw) |
| +static void _rtl_pci_prepare_bcn_tasklet(unsigned long data) |
| { |
| + struct ieee80211_hw *hw = (struct ieee80211_hw *)data; |
| struct rtl_priv *rtlpriv = rtl_priv(hw); |
| struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
| struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
| @@ -1193,10 +1195,10 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw, |
| |
| /*task */ |
| tasklet_init(&rtlpriv->works.irq_tasklet, |
| - (void (*)(unsigned long))_rtl_pci_irq_tasklet, |
| + _rtl_pci_irq_tasklet, |
| (unsigned long)hw); |
| tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet, |
| - (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet, |
| + _rtl_pci_prepare_bcn_tasklet, |
| (unsigned long)hw); |
| INIT_WORK(&rtlpriv->works.lps_change_work, |
| rtl_lps_change_work_callback); |
| -- |
| 2.7.4 |
| |
