From 227ca8c4c40adf601e9cef25c45019e80429b204 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 9 May 2014 15:04:11 +0200 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_cmd.c | 5 +---- drivers/staging/rtl8723au/hal/hal_intf.c | 5 ----- drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 1 - drivers/staging/rtl8723au/include/hal_intf.h | 2 -- drivers/staging/rtl8723au/include/osdep_service.h | 5 ----- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index 5276686a0a99..7bac18078367 100644 --- 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 1931f428722f..6b3edc044d4c 100644 --- 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 ee05bc00655a..a00dd7eb7d1c 100644 --- 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 52b33fe61b3f..5a225e677daa 100644 --- 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 f595c85b5404..86f34523a369 100644 --- a/drivers/staging/rtl8723au/include/osdep_service.h +++ b/drivers/staging/rtl8723au/include/osdep_service.h @@ -54,11 +54,6 @@ #include #include -struct rtw_adapter; -struct c2h_evt_hdr; - -typedef s32 (*c2h_id_filter)(u8 id); - struct rtw_queue { struct list_head queue; spinlock_t lock; -- 2.39.5