From: Nishka Dasgupta Date: Wed, 12 Jun 2019 18:04:36 +0000 (+0530) Subject: staging: rtl8723bs: Remove function rtw_set_scan_deny_timer_hdl() X-Git-Tag: v5.3-rc1~126^2~258 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f4db969efa80552f64a38b8b004ed7c8f91cc5c4;p=linux-block.git staging: rtl8723bs: Remove function rtw_set_scan_deny_timer_hdl() Remove function rtw_set_scan_deny_timer_hdl as all it does is call rtw_clear_scan_deny. Modify call sites of rtw_set_scan_deny_timer_hdl to call rtw_clear_scan_deny instead. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index b42d94a3a28c..63b381ed4a17 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1930,11 +1930,6 @@ inline void rtw_clear_scan_deny(struct adapter *adapter) DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); } -void rtw_set_scan_deny_timer_hdl(struct adapter *adapter) -{ - rtw_clear_scan_deny(adapter); -} - void rtw_set_scan_deny(struct adapter *adapter, u32 ms) { struct mlme_priv *mlmepriv = &adapter->mlmepriv; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 9c9aa9254288..d3c07d1c36e9 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -589,7 +589,6 @@ extern void rtw_scan_timeout_handler(struct timer_list *t); extern void rtw_dynamic_check_timer_handler(struct adapter *adapter); bool rtw_is_scan_deny(struct adapter *adapter); void rtw_clear_scan_deny(struct adapter *adapter); -void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); void rtw_set_scan_deny(struct adapter *adapter, u32 ms); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c index da4bd5292b0a..aa2499f10611 100644 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c @@ -26,7 +26,7 @@ static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t) struct adapter *adapter = from_timer(adapter, t, mlmepriv.set_scan_deny_timer); - rtw_set_scan_deny_timer_hdl(adapter); + rtw_clear_scan_deny(adapter); } void rtw_init_mlme_timer(struct adapter *padapter)