Commit 2913d4c0 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove sreset_reset_value from hal_ops 



Remove sreset_reset_value from hal_ops and remove its wrapper
rtw_hal_sreset_reset_value(). Call sreset_reset_value() directly
instead.

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


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

drivers/staging/r8188eu/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -227,12 +227,6 @@ void rtw_hal_sreset_reset(struct adapter *adapt) 
		adapt->HalFunc.silentreset(adapt);

}



void rtw_hal_sreset_reset_value(struct adapter *adapt)

{

	if (adapt->HalFunc.sreset_reset_value)

		adapt->HalFunc.sreset_reset_value(adapt);

}



void rtw_hal_sreset_xmit_status_check(struct adapter *adapt)

{

	if (adapt->HalFunc.sreset_xmit_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_reset_value = &sreset_reset_value;

	pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;

	pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;

	pHalFunc->sreset_linked_status_check  = &rtl8188e_sreset_linked_status_check;

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_reset_value)(struct adapter *padapter);

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

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

	void (*sreset_linked_status_check) (struct adapter *padapter);
@@ -274,7 +273,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, 
				     struct wlan_bssid_ex *src);



void rtw_hal_sreset_reset(struct adapter *padapter);

void rtw_hal_sreset_reset_value(struct adapter *padapter);

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

drivers/staging/r8188eu/os_dep/os_intfs.c

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter) 


	_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);



	rtw_hal_sreset_reset_value(padapter);

	sreset_reset_value(padapter);

	pwrctrlpriv->pwr_state_check_cnts = 0;



	/* mlmeextpriv */