Commit 253b1ba9 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove sreset_xmit_status_check from hal_ops 



Remove sreset_xmit_status_check from hal_ops and remove its wrapper
rtw_hal_sreset_xmit_status_check().
Call rtl8188e_sreset_xmit_status_check() directly instead.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-19-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d800d734

drivers/staging/r8188eu/core/rtw_cmd.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "../include/rtw_br_ext.h"

#include "../include/rtw_mlme_ext.h"

#include "../include/rtl8188e_dm.h"

#include "../include/rtl8188e_sreset.h"



/*

Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.
@@ -1492,7 +1493,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) 
		expire_timeout_chk(padapter);

#endif



	rtw_hal_sreset_xmit_status_check(padapter);

	rtl8188e_sreset_xmit_status_check(padapter);



	linked_status_chk(padapter);

	traffic_status_watchdog(padapter);

drivers/staging/r8188eu/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -221,12 +221,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt, 
		adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);

}



void rtw_hal_sreset_xmit_status_check(struct adapter *adapt)

{

	if (adapt->HalFunc.sreset_xmit_status_check)

		adapt->HalFunc.sreset_xmit_status_check(adapt);

}



void rtw_hal_sreset_linked_status_check(struct adapter *adapt)

{

	if (adapt->HalFunc.sreset_linked_status_check)

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+0 −1
Original line number Diff line number Diff line
@@ -1803,7 +1803,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;

	pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;



	pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;

	pHalFunc->sreset_linked_status_check  = &rtl8188e_sreset_linked_status_check;

	pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;

drivers/staging/r8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ struct hal_ops { 
					     u16 efuse_addr, u8 word_en,

					     u8 *data, bool bPseudoTest);



	void (*sreset_xmit_status_check)(struct adapter *padapter);

	void (*sreset_linked_status_check) (struct adapter *padapter);

	u8 (*sreset_get_wifi_status)(struct adapter *padapter);
@@ -271,7 +270,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, 
				     struct wlan_bssid_ex *dst,

				     struct wlan_bssid_ex *src);



void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);

void rtw_hal_sreset_linked_status_check(struct adapter *padapter);

u8   rtw_hal_sreset_get_wifi_status(struct adapter *padapter);