staging: rtl8723au: Call bandwidth and channel setting handlers directly

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_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index e7c67c396981b13afc7d5446f3b29568ffdc68f3..affb067642528a0bb8f3c9fe80953b1acf87235b 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -335,7 +335,7 @@ void SelectChannel23a(struct rtw_adapter *padapter, unsigned char channel)
        /* saved channel info */
        rtw_set_oper_ch23a(padapter, channel);
 
-       rtw_hal_set_chan23a(padapter, channel);
+       PHY_SwChnl8723A(padapter, channel);
 
        mutex_unlock(&adapter_to_dvobj(padapter)->setch_mutex);
 }
@@ -348,8 +348,8 @@ void SetBWMode23a(struct rtw_adapter *padapter, unsigned short bwmode, unsigned
        rtw_set_oper_bw23a(padapter, bwmode);
        rtw_set_oper_ch23aoffset23a(padapter, channel_offset);
 
-       rtw_hal_set_bwmode23a(padapter, (enum ht_channel_width)bwmode,
-                          channel_offset);
+       PHY_SetBWMode23a8723A(padapter, (enum ht_channel_width)bwmode,
+                             channel_offset);
 
        mutex_unlock(&adapter_to_dvobj(padapter)->setbw_mutex);
 }
@@ -386,7 +386,7 @@ void set_channel_bwmode23a(struct rtw_adapter *padapter, unsigned char channel,
        rtw_set_oper_bw23a(padapter, bwmode);
        rtw_set_oper_ch23aoffset23a(padapter, channel_offset);
 
-       rtw_hal_set_chan23a(padapter, center_ch); /*  set center channel */
+       PHY_SwChnl8723A(padapter, center_ch); /*  set center channel */
 
        mutex_unlock(&adapter_to_dvobj(padapter)->setch_mutex);
 

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 76c8b1fec7778496ae600506221ab652c8967386..9ee4df640a649faac0a1fe5e553d26bc9ab49273 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -197,20 +197,6 @@ s32        rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter)
        return _FAIL;
 }
 
-void   rtw_hal_set_bwmode23a(struct rtw_adapter *padapter,
-                          enum ht_channel_width Bandwidth, u8 offset)
-{
-       if (padapter->HalFunc.set_bwmode_handler)
-               padapter->HalFunc.set_bwmode_handler(padapter, Bandwidth,
-                                                    offset);
-}
-
-void   rtw_hal_set_chan23a(struct rtw_adapter *padapter, u8 channel)
-{
-       if (padapter->HalFunc.set_channel_handler)
-               padapter->HalFunc.set_channel_handler(padapter, channel);
-}
-
 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 8764172faaa4f3f7429990535b9bfebe57c39301..8002063a601c3e289f1b70e700e4cc8085d43f4a 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1706,9 +1706,6 @@ exit:
 
 void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
 {
-       pHalFunc->set_bwmode_handler = &PHY_SetBWMode23a8723A;
-       pHalFunc->set_channel_handler = &PHY_SwChnl8723A;
-
        pHalFunc->SetBeaconRelatedRegistersHandler =
                &rtl8723a_SetBeaconRelatedRegisters;
 

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 464c29aa8843c15da9cb3273b3a6478b46657c8e..7dfd42b0a1f06d961a9cdded7d253f112fc97fdb 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -76,9 +76,6 @@ struct hal_ops {
        void (*enable_interrupt)(struct rtw_adapter *padapter);
        void (*disable_interrupt)(struct rtw_adapter *padapter);
        s32 (*interrupt_handler)(struct rtw_adapter *padapter);
-       void (*set_bwmode_handler)(struct rtw_adapter *padapter,
-                                  enum ht_channel_width Bandwidth, u8 Offset);
-       void (*set_channel_handler)(struct rtw_adapter *padapter, u8 channel);
 
        u8 (*GetHalDefVarHandler)(struct rtw_adapter *padapter,
                                  enum hal_def_variable eVariable,
@@ -214,10 +211,6 @@ void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter);
 
 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 hw_var_set_correct_tsf(struct rtw_adapter *padapter);
 void hw_var_set_mlme_disconnect(struct rtw_adapter *padapter);
 void hw_var_set_opmode(struct rtw_adapter *padapter, u8 mode);