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

staging: r8188eu: remove sreset_get_wifi_status from hal_ops 



Remove sreset_get_wifi_status from hal_ops and remove its wrapper
rtw_hal_sreset_get_wifi_status(). Call sreset_get_wifi_status()
directly instead.

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


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

drivers/staging/r8188eu/hal/hal_intf.c

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

}



u8   rtw_hal_sreset_get_wifi_status(struct adapter *adapt)

{

	u8 status = 0;



	if (adapt->HalFunc.sreset_get_wifi_status)

		status = adapt->HalFunc.sreset_get_wifi_status(adapt);

	return status;

}



int rtw_hal_iol_cmd(struct adapter  *adapter, struct xmit_frame *xmit_frame,

		    u32 max_wating_ms, u32 bndy_cnt)

{

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+0 −2
Original line number Diff line number Diff line
@@ -1803,8 +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_get_wifi_status  = &sreset_get_wifi_status;



	pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;



	pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;

drivers/staging/r8188eu/include/hal_intf.h

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

					     u8 *data, bool bPseudoTest);



	u8 (*sreset_get_wifi_status)(struct adapter *padapter);



	int (*IOL_exec_cmds_sync)(struct adapter *padapter,

				  struct xmit_frame *frame, u32 max_wait,

				  u32 bndy_cnt);
@@ -269,8 +267,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, 
				     struct wlan_bssid_ex *dst,

				     struct wlan_bssid_ex *src);



u8   rtw_hal_sreset_get_wifi_status(struct adapter *padapter);



int rtw_hal_iol_cmd(struct adapter  *adapter, struct xmit_frame *xmit_frame,

		    u32 max_wating_ms, u32 bndy_cnt);

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -2305,7 +2305,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le 
		rtw_hal_set_hwreg(padapter, HW_VAR_TRIGGER_GPIO_0, NULL);

		break;

	case GEN_MP_IOCTL_SUBCODE(GET_WIFI_STATUS):

		*pdata = rtw_hal_sreset_get_wifi_status(padapter);

		*pdata = sreset_get_wifi_status(padapter);

		break;

	default:

		break;