lkml.org 
[lkml]   [2020]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 157/399] rtlwifi: rtl_pci: Fix -Wcast-function-type
    Date
    From: Phong Tran <tranmanphong@gmail.com>

    [ Upstream commit cb775c88da5d48a85d99d95219f637b6fad2e0e9 ]

    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>
    ---
    drivers/net/wireless/realtek/rtlwifi/pci.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
    index f88d26535978d..25335bd2873b6 100644
    --- a/drivers/net/wireless/realtek/rtlwifi/pci.c
    +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
    @@ -1061,13 +1061,15 @@ done:
    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.20.1


    \
     
     \ /
      Last update: 2020-02-21 09:45    [W:4.472 / U:0.924 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site