staging: rtl8723au: Remove obsolete hal thread handling code

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 04cc53424b51e73f70b34fa5f5544519faba33d3..dad16bc7804b7d7a04c0c3e157d76c734fa18f0f 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -262,19 +262,6 @@ void       rtw_hal_add_ra_tid23a(struct rtw_adapter *padapter, u32 bitmap, u8 arg, u8
                padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level);
 }
 
-/*     Start specifical interface thread               */
-void   rtw_hal_start_thread23a(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.run_thread)
-               padapter->HalFunc.run_thread(padapter);
-}
-/*     Start specifical interface thread               */
-void   rtw_hal_stop_thread23a(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.cancel_thread)
-               padapter->HalFunc.cancel_thread(padapter);
-}
-
 u32    rtw_hal_read_bbreg23a(struct rtw_adapter *padapter, u32 RegAddr, u32 BitMask)
 {
        u32 data = 0;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 346aeca7ec9c49a062e939713d9ac41e722c7972..934f18dbd94158723576617d56492fbdcc863922 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1738,8 +1738,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
                &rtl8723a_SetBeaconRelatedRegisters;
 
        pHalFunc->Add_RateATid = &rtl8723a_add_rateatid;
-       pHalFunc->run_thread = NULL;
-       pHalFunc->cancel_thread = NULL;
 
        pHalFunc->read_bbreg = &PHY_QueryBBReg;
        pHalFunc->write_bbreg = &PHY_SetBBReg;

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 89516467f24107fa10ca2f46a0144276b26d8485..1df82b6853bebf8090be5fe290fda062d7452382 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -123,8 +123,6 @@ struct hal_ops {
 
        void (*Add_RateATid)(struct rtw_adapter *padapter, u32 bitmap,
                             u8 arg, u8 rssi_level);
-       void (*run_thread)(struct rtw_adapter *padapter);
-       void (*cancel_thread)(struct rtw_adapter *padapter);
 
        u8 (*interface_ps_func)(struct rtw_adapter *padapter,
                                enum hal_intf_ps_func efunc_id, u8 *val);
@@ -274,8 +272,6 @@ void        rtw_hal_free_recv_priv23a(struct rtw_adapter *padapter);
 void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level);
 void   rtw_hal_add_ra_tid23a(struct rtw_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level);
 void   rtw_hal_clone_data(struct rtw_adapter *dst_padapter, struct rtw_adapter *src_padapter);
-void   rtw_hal_start_thread23a(struct rtw_adapter *padapter);
-void   rtw_hal_stop_thread23a(struct rtw_adapter *padapter);
 
 void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter);
 

diff --git a/drivers/staging/rtl8723au/include/osdep_intf.h b/drivers/staging/rtl8723au/include/osdep_intf.h
index b603cf532900af391e9d2b7987cf8c035c6c3531..d3e22635e9ea2d9842181fc0b0387e7be26408c4 100644 (file)
--- a/drivers/staging/rtl8723au/include/osdep_intf.h
+++ b/drivers/staging/rtl8723au/include/osdep_intf.h
@@ -26,8 +26,6 @@ u8 rtw_init_drv_sw23a(struct rtw_adapter *padapter);
 u8 rtw_free_drv_sw23a(struct rtw_adapter *padapter);
 u8 rtw_reset_drv_sw23a(struct rtw_adapter *padapter);
 
-u32 rtw_start_drv_threads23a(struct rtw_adapter *padapter);
-void rtw_stop_drv_threads23a (struct rtw_adapter *padapter);
 void rtw_cancel_all_timer23a(struct rtw_adapter *padapter);
 
 int rtw_init_netdev23a_name23a(struct net_device *pnetdev, const char *ifname);

diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index 23e0a3f0142472d585e8dab35590f9bdf2eb2a61..2b2df95923b59cddc352766e0bb9a627662003ea 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -377,26 +377,6 @@ struct net_device *rtw_init_netdev23a(struct rtw_adapter *old_padapter)
        return pnetdev;
 }
 
-u32 rtw_start_drv_threads23a(struct rtw_adapter *padapter)
-{
-       u32 _status = _SUCCESS;
-
-       RT_TRACE(_module_os_intfs_c_, _drv_info_,
-                ("+rtw_start_drv_threads23a\n"));
-
-       rtw_hal_start_thread23a(padapter);
-       return _status;
-}
-
-void rtw_stop_drv_threads23a(struct rtw_adapter *padapter)
-{
-       RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads23a\n"));
-
-       flush_workqueue(padapter->cmdpriv.wq);
-
-       rtw_hal_stop_thread23a(padapter);
-}
-
 static u8 rtw_init_default_value(struct rtw_adapter *padapter)
 {
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
@@ -714,12 +694,6 @@ int netdev_open23a(struct net_device *pnetdev)
                DBG_8723A("MAC Address = "MAC_FMT"\n",
                          MAC_ARG(pnetdev->dev_addr));
 
-               status = rtw_start_drv_threads23a(padapter);
-               if (status == _FAIL) {
-                       DBG_8723A("Initialize driver software resource Failed!\n");
-                       goto netdev_open23a_error;
-               }
-
                if (init_hw_mlme_ext23a(padapter) == _FAIL) {
                        DBG_8723A("can't init mlme_ext_priv\n");
                        goto netdev_open23a_error;

diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index 31ab34601bab99546a551c1cd70a93b87a25cffc..d71641dab2cc84191d3be1bc114c14f9b005f983 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -333,7 +333,7 @@ static void rtw_dev_unload(struct rtw_adapter *padapter)
 
                /* s4. */
                if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
-                       rtw_stop_drv_threads23a(padapter);
+                       flush_workqueue(padapter->cmdpriv.wq);
 
                /* s5. */
                if (!padapter->bSurpriseRemoved) {