staging: rtl8723au: Get rid of rtw_hal_dm_* clutter

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

diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c
index 3b9f8437c38a84c4c8705c5ed388f116834810e9..32c5f72c9a4456358463b41aad8520f749910754 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -1038,7 +1038,7 @@ static void dynamic_chk_wk_hdl(struct rtw_adapter *padapter, u8 *pbuf, int sz)
        linked_status_chk23a(padapter);
        traffic_status_watchdog(padapter);
 
-       rtw_hal_dm_watchdog23a(padapter);
+       rtl8723a_HalDmWatchDog(padapter);
 
 #ifdef CONFIG_8723AU_BT_COEXIST
        /*  */

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 77d38e863ee78061ee2b08a1b6dbc95c1c62f7cb..1e42a33e6967ee376cc3eeb77bd2c1187815e6bf 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -38,17 +38,6 @@ void rtw_hal_free_data23a(struct rtw_adapter *padapter)
        if (padapter->HalFunc.free_hal_data)
                padapter->HalFunc.free_hal_data(padapter);
 }
-void   rtw_hal_dm_init23a(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.dm_init)
-               padapter->HalFunc.dm_init(padapter);
-}
-void rtw_hal_dm_deinit23a(struct rtw_adapter *padapter)
-{
-       /*  cancel dm  timer */
-       if (padapter->HalFunc.dm_deinit)
-               padapter->HalFunc.dm_deinit(padapter);
-}
 void   rtw_hal_sw_led_init23a(struct rtw_adapter *padapter)
 {
        if (padapter->HalFunc.InitSwLeds)
@@ -273,12 +262,6 @@ void       rtw_hal_set_chan23a(struct rtw_adapter *padapter, u8 channel)
                padapter->HalFunc.set_channel_handler(padapter, channel);
 }
 
-void   rtw_hal_dm_watchdog23a(struct rtw_adapter *padapter)
-{
-       if (padapter->HalFunc.hal_dm_watchdog)
-               padapter->HalFunc.hal_dm_watchdog(padapter);
-}
-
 void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter)
 {
        if (padapter->HalFunc.SetBeaconRelatedRegistersHandler)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index e23e5e38f01b01d82e8c5aa768adceeb8b7c1c65..5e272624457635252cf6ea1585848202c7e2bd15 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1723,16 +1723,11 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
 {
        pHalFunc->free_hal_data = &rtl8723a_free_hal_data;
 
-       pHalFunc->dm_init = &rtl8723a_init_dm_priv;
-       pHalFunc->dm_deinit = &rtl8723a_deinit_dm_priv;
-
        pHalFunc->read_chip_version = &rtl8723a_read_chip_version;
 
        pHalFunc->set_bwmode_handler = &PHY_SetBWMode23a8723A;
        pHalFunc->set_channel_handler = &PHY_SwChnl8723A;
 
-       pHalFunc->hal_dm_watchdog = &rtl8723a_HalDmWatchDog;
-
        pHalFunc->SetBeaconRelatedRegistersHandler =
                &rtl8723a_SetBeaconRelatedRegisters;
 

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 681e8f7f4c65d349dcab91b3702a03ea1bf529b8..959105e34a667b48de29276928ad38f67f3fbff5 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -78,8 +78,6 @@ struct hal_ops {
        void (*InitSwLeds)(struct rtw_adapter *padapter);
        void (*DeInitSwLeds)(struct rtw_adapter *padapter);
 
-       void (*dm_init)(struct rtw_adapter *padapter);
-       void (*dm_deinit)(struct rtw_adapter *padapter);
        void (*read_chip_version)(struct rtw_adapter *padapter);
 
        void (*intf_chip_configure)(struct rtw_adapter *padapter);
@@ -91,8 +89,6 @@ struct hal_ops {
                                   enum ht_channel_width Bandwidth, u8 Offset);
        void (*set_channel_handler)(struct rtw_adapter *padapter, u8 channel);
 
-       void (*hal_dm_watchdog)(struct rtw_adapter *padapter);
-
        u8 (*GetHalDefVarHandler)(struct rtw_adapter *padapter,
                                  enum hal_def_variable eVariable,
                                  void *pValue);
@@ -200,8 +196,6 @@ int rtw_resume_process23a(struct rtw_adapter *padapter);
 
 void   rtw_hal_free_data23a(struct rtw_adapter *padapter);
 
-void rtw_hal_dm_init23a(struct rtw_adapter *padapter);
-void rtw_hal_dm_deinit23a(struct rtw_adapter *padapter);
 void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter);
 void rtw_hal_sw_led_deinit23a(struct rtw_adapter *padapter);
 
@@ -260,7 +254,6 @@ s32 rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter);
 void   rtw_hal_set_bwmode23a(struct rtw_adapter *padapter,
                           enum ht_channel_width Bandwidth, u8 Offset);
 void   rtw_hal_set_chan23a(struct rtw_adapter *padapter, u8 channel);
-void   rtw_hal_dm_watchdog23a(struct rtw_adapter *padapter);
 
 void rtw_hal_sreset_init23a(struct rtw_adapter *padapter);
 void rtw_hal_sreset_reset23a(struct rtw_adapter *padapter);

diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index 98c203dd3efddd158774a5325cb52c8f174591cc..6273497aa61e86a40a7c121aa9f38c48321f305d 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -522,7 +522,7 @@ u8 rtw_init_drv_sw23a(struct rtw_adapter *padapter)
 
        ret8 = rtw_init_default_value(padapter);
 
-       rtw_hal_dm_init23a(padapter);
+       rtl8723a_init_dm_priv(padapter);
        rtw_hal_sw_led_init23a(padapter);
 
        rtw_hal_sreset_init23a(padapter);
@@ -563,7 +563,7 @@ void rtw_cancel_all_timer23a(struct rtw_adapter *padapter)
 
        del_timer_sync(&padapter->recvpriv.signal_stat_timer);
        /* cancel dm timer */
-       rtw_hal_dm_deinit23a(padapter);
+       rtl8723a_deinit_dm_priv(padapter);
 }
 
 u8 rtw_free_drv_sw23a(struct rtw_adapter *padapter)