staging: rtl8723bs: move rtw_init_mlme_timer to core/rtw_mlme.c

Move the function rtw_init_mlme_timer from os_dep/mlme_linux.c to
core/rtw_mlme.c to reduce code in the os_dep directory.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Link: https://lore.kernel.org/r/20250801083131.82915-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 6932bd3b20548e25381b005cf05044dd4425e22b..dbeba9cdfa7301174f886fb9b641833b52b46079 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -9,6 +9,36 @@
 #include <hal_btcoex.h>
 #include <linux/jiffies.h>
 
+static void _dynamic_check_timer_handler(struct timer_list *t)
+{
+       struct adapter *adapter =
+               timer_container_of(adapter, t, mlmepriv.dynamic_chk_timer);
+
+       rtw_dynamic_check_timer_handler(adapter);
+
+       _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
+}
+
+static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t)
+{
+       struct adapter *adapter =
+               timer_container_of(adapter, t, mlmepriv.set_scan_deny_timer);
+
+       rtw_clear_scan_deny(adapter);
+}
+
+static void rtw_init_mlme_timer(struct adapter *padapter)
+{
+       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
+
+       timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0);
+       timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0);
+       timer_setup(&pmlmepriv->dynamic_chk_timer,
+                   _dynamic_check_timer_handler, 0);
+       timer_setup(&pmlmepriv->set_scan_deny_timer,
+                   _rtw_set_scan_deny_timer_hdl, 0);
+}
+
 int    rtw_init_mlme_priv(struct adapter *padapter)
 {
        int     i;

diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/staging/rtl8723bs/include/mlme_osdep.h
index c84c84c68286542e3fe0cc843e5d8604e59a00ae..4bb7a01caf4a0b235a5513e4867cf93504b8314f 100644 (file)
--- a/drivers/staging/rtl8723bs/include/mlme_osdep.h
+++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h
@@ -8,7 +8,6 @@
 #define __MLME_OSDEP_H_
 
 
-extern void rtw_init_mlme_timer(struct adapter *padapter);
 extern void rtw_os_indicate_disconnect(struct adapter *adapter);
 extern void rtw_os_indicate_connect(struct adapter *adapter);
 extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie);

diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
index d22d6cf3cb11964e44785185a792775ec5f18dbc..5cb27ddab7699c2b0e3e101b01e86126dbdd78e7 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
@@ -6,36 +6,6 @@
  ******************************************************************************/
 #include <drv_types.h>
 
-static void _dynamic_check_timer_handler(struct timer_list *t)
-{
-       struct adapter *adapter =
-               timer_container_of(adapter, t, mlmepriv.dynamic_chk_timer);
-
-       rtw_dynamic_check_timer_handler(adapter);
-
-       _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
-}
-
-static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t)
-{
-       struct adapter *adapter =
-               timer_container_of(adapter, t, mlmepriv.set_scan_deny_timer);
-
-       rtw_clear_scan_deny(adapter);
-}
-
-void rtw_init_mlme_timer(struct adapter *padapter)
-{
-       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
-
-       timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0);
-       timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0);
-       timer_setup(&pmlmepriv->dynamic_chk_timer,
-                   _dynamic_check_timer_handler, 0);
-       timer_setup(&pmlmepriv->set_scan_deny_timer,
-                   _rtw_set_scan_deny_timer_hdl, 0);
-}
-
 void rtw_os_indicate_connect(struct adapter *adapter)
 {
        struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);