staging: rtl8723au: Call c2h_handler_8723a() directly instead of via HAL interface

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 7bac180..6bb67f8 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -1307,10 +1307,10 @@ static int c2h_evt_hdl(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
                if (c2h_evt_read23a(adapter, buf) == _SUCCESS) {
                        c2h_evt = (struct c2h_evt_hdr *)buf;
 
-                       ret = rtw_hal_c2h_handler23a(adapter, c2h_evt);
+                       ret = c2h_handler_8723a(adapter, c2h_evt);
                }
        } else
-               ret = rtw_hal_c2h_handler23a(adapter, c2h_evt);
+               ret = c2h_handler_8723a(adapter, c2h_evt);
 
        return ret;
 }
@@ -1343,7 +1343,7 @@ void rtw_evt_work(struct work_struct *work)
 
        if (c2h_id_filter_ccx_8723a(ework->u.c2h_evt.id) == true) {
                /* Handle CCX report here */
-               rtw_hal_c2h_handler23a(adapter, &ework->u.c2h_evt);
+               c2h_handler_8723a(adapter, &ework->u.c2h_evt);
                kfree(ework);
        } else {
                /*

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 6b3edc0..d22c62c 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -360,11 +360,3 @@ void rtw_hal_reset_security_engine23a(struct rtw_adapter *adapter)
        if (adapter->HalFunc.hal_reset_security_engine)
                adapter->HalFunc.hal_reset_security_engine(adapter);
 }
-
-s32 rtw_hal_c2h_handler23a(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
-{
-       s32 ret = _FAIL;
-       if (adapter->HalFunc.c2h_handler)
-               ret = adapter->HalFunc.c2h_handler(adapter, c2h_evt);
-       return ret;
-}

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index a00dd7e..5a0a368 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1661,8 +1661,7 @@ s32 c2h_id_filter_ccx_8723a(u8 id)
        return ret;
 }
 
-static s32 c2h_handler_8723a(struct rtw_adapter *padapter,
-                            struct c2h_evt_hdr *c2h_evt)
+s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt)
 {
        s32 ret = _SUCCESS;
        u8 i = 0;
@@ -1764,8 +1763,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->SetHalODMVarHandler = &rtl8723a_SetHalODMVar;
 
        pHalFunc->hal_notch_filter = &hal_notch_filter_8723a;
-
-       pHalFunc->c2h_handler = c2h_handler_8723a;
 }
 
 void rtl8723a_InitAntenna_Selection(struct rtw_adapter *padapter)

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 5a225e6..bc29bf2 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -158,7 +158,6 @@ struct hal_ops {
 
        void (*hal_notch_filter)(struct rtw_adapter *adapter, bool enable);
        void (*hal_reset_security_engine)(struct rtw_adapter *adapter);
-       s32 (*c2h_handler)(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
 };
 
 enum rt_eeprom_type {
@@ -280,7 +279,6 @@ bool rtw_hal_sreset_inprogress(struct rtw_adapter *padapter);
 void rtw_hal_notch_filter23a(struct rtw_adapter *adapter, bool enable);
 void rtw_hal_reset_security_engine23a(struct rtw_adapter *adapter);
 
-s32 rtw_hal_c2h_handler23a(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt);
 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);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index a6d4bc7..d4121a8 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -545,5 +545,6 @@ void rtl8723a_start_thread(struct rtw_adapter *padapter);
 void rtl8723a_stop_thread(struct rtw_adapter *padapter);
 
 s32 c2h_id_filter_ccx_8723a(u8 id);
+s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
 
 #endif