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

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

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ static void c2h_wk_callback(_workitem *work) 
			c2h_evt = rtw_malloc(16);

			if (c2h_evt != NULL) {

				/* 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);

					continue;

				}

drivers/staging/rtl8723bs/hal/hal_intf.c

+0 −5
Original line number Diff line number Diff line
@@ -400,11 +400,6 @@ bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *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 ret = _FAIL;

drivers/staging/rtl8723bs/hal/sdio_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ void sd_int_dpc(struct adapter *adapter) 
		DBG_8192C("%s: C2H Command\n", __func__);

		c2h_evt = rtw_zmalloc(16);

		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)) {

					/* Handle CCX report here */

					rtw_hal_c2h_handler(adapter, (u8 *)c2h_evt);

drivers/staging/rtl8723bs/include/hal_intf.h

+0 −1
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ void rtw_hal_notch_filter(struct adapter * adapter, bool enable); 
void rtw_hal_reset_security_engine(struct adapter * adapter);



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);

c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE