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

staging: r8188eu: remove silentreset from hal_ops 



Remove silentreset from hal_ops and remove its wrapper
rtw_hal_sreset_reset().
Call rtl8188e_silentreset_for_specific_platform() directly instead.

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


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

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_reset(struct adapter *adapt)

{

	if (adapt->HalFunc.silentreset)

		adapt->HalFunc.silentreset(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->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;

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

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

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

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

				     struct wlan_bssid_ex *src);



void rtw_hal_sreset_reset(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/ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -4304,7 +4304,7 @@ static int rtw_dbg_port(struct net_device *dev, 
		case 0x0f:

			if (extra_arg == 0) {

				DBG_88E("###### silent reset test.......#####\n");

				rtw_hal_sreset_reset(padapter);

				rtl8188e_silentreset_for_specific_platform(padapter);

			}

			break;

		case 0x15: