Commit 414faeb1 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging: rtl8723bs: Remove rtw_hal_c2h_evt_read()

Modify call sites of rtw_hal_c2h_evt_read to call c2h_evt_read_88xx
instead, as rtw_hal_c2h_evt_read does nothing except call
c2h_evt_read_88xx.
Remove function rtw_hal_c2h_evt_read as it is now not necessary.
Issue found with Coccinelle.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ebc8751
...@@ -1918,7 +1918,7 @@ static void c2h_wk_callback(_workitem *work) ...@@ -1918,7 +1918,7 @@ static void c2h_wk_callback(_workitem *work)
c2h_evt = rtw_malloc(16); c2h_evt = rtw_malloc(16);
if (c2h_evt != NULL) { if (c2h_evt != NULL) {
/* This C2H event is not read, read & clear now */ /* This C2H event is not read, read & clear now */
if (rtw_hal_c2h_evt_read(adapter, c2h_evt) != _SUCCESS) { if (c2h_evt_read_88xx(adapter, c2h_evt) != _SUCCESS) {
kfree(c2h_evt); kfree(c2h_evt);
continue; continue;
} }
......
...@@ -400,11 +400,6 @@ bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf) ...@@ -400,11 +400,6 @@ bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf)
return c2h_evt_valid((struct c2h_evt_hdr_88xx *)buf); return c2h_evt_valid((struct c2h_evt_hdr_88xx *)buf);
} }
s32 rtw_hal_c2h_evt_read(struct adapter *adapter, u8 *buf)
{
return c2h_evt_read_88xx(adapter, buf);
}
s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt) s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt)
{ {
s32 ret = _FAIL; s32 ret = _FAIL;
......
...@@ -1025,7 +1025,7 @@ void sd_int_dpc(struct adapter *adapter) ...@@ -1025,7 +1025,7 @@ void sd_int_dpc(struct adapter *adapter)
DBG_8192C("%s: C2H Command\n", __func__); DBG_8192C("%s: C2H Command\n", __func__);
c2h_evt = rtw_zmalloc(16); c2h_evt = rtw_zmalloc(16);
if (c2h_evt) { if (c2h_evt) {
if (rtw_hal_c2h_evt_read(adapter, (u8 *)c2h_evt) == _SUCCESS) { if (c2h_evt_read_88xx(adapter, (u8 *)c2h_evt) == _SUCCESS) {
if (c2h_id_filter_ccx_8723b((u8 *)c2h_evt)) { if (c2h_id_filter_ccx_8723b((u8 *)c2h_evt)) {
/* Handle CCX report here */ /* Handle CCX report here */
rtw_hal_c2h_handler(adapter, (u8 *)c2h_evt); rtw_hal_c2h_handler(adapter, (u8 *)c2h_evt);
......
...@@ -388,7 +388,6 @@ void rtw_hal_notch_filter(struct adapter * adapter, bool enable); ...@@ -388,7 +388,6 @@ void rtw_hal_notch_filter(struct adapter * adapter, bool enable);
void rtw_hal_reset_security_engine(struct adapter * adapter); void rtw_hal_reset_security_engine(struct adapter * adapter);
bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf); bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf);
s32 rtw_hal_c2h_evt_read(struct adapter *adapter, u8 *buf);
s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt); s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt);
c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter); c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment