staging: rtl8723au: The driver only has one c2h_id_filter

Since we only have one function for this, there is no point in keeping
the HAL silliness.

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 5276686..7bac180 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -1330,13 +1330,10 @@ void rtw_evt_work(struct work_struct *work)
 {
        struct evt_work *ework;
        struct rtw_adapter *adapter;
-       c2h_id_filter ccx_id_filter;
 
        ework = container_of(work, struct evt_work, work);
        adapter = ework->adapter;
 
-       ccx_id_filter = rtw_hal_c2h_id_filter_ccx23a(adapter);
-
        c2h_evt_clear23a(adapter);
 
        if (!c2h_evt_exist(&ework->u.c2h_evt)) {
@@ -1344,7 +1341,7 @@ void rtw_evt_work(struct work_struct *work)
                return;
        }
 
-       if (ccx_id_filter(ework->u.c2h_evt.id) == true) {
+       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);
                kfree(ework);

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 1931f42..6b3edc0 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -368,8 +368,3 @@ s32 rtw_hal_c2h_handler23a(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_
                ret = adapter->HalFunc.c2h_handler(adapter, c2h_evt);
        return ret;
 }
-
-c2h_id_filter rtw_hal_c2h_id_filter_ccx23a(struct rtw_adapter *adapter)
-{
-       return adapter->HalFunc.c2h_id_filter_ccx;
-}

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index ee05bc0..a00dd7e 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1766,7 +1766,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->hal_notch_filter = &hal_notch_filter_8723a;
 
        pHalFunc->c2h_handler = c2h_handler_8723a;
-       pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_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 52b33fe..5a225e6 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -159,7 +159,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);
-       c2h_id_filter c2h_id_filter_ccx;
 };
 
 enum rt_eeprom_type {
@@ -282,7 +281,6 @@ 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);
-c2h_id_filter rtw_hal_c2h_id_filter_ccx23a(struct rtw_adapter *adapter);
 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/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h
index f595c85..86f3452 100644 (file)
--- a/drivers/staging/rtl8723au/include/osdep_service.h
+++ b/drivers/staging/rtl8723au/include/osdep_service.h
@@ -54,11 +54,6 @@
 #include <linux/usb.h>
 #include <linux/usb/ch9.h>
 
-struct rtw_adapter;
-struct c2h_evt_hdr;
-
-typedef s32 (*c2h_id_filter)(u8 id);
-
 struct rtw_queue {
        struct  list_head       queue;
        spinlock_t              lock;