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

staging: r8188eu: remove sreset_linked_status_check from hal_ops 



Remove sreset_linked_status_check from hal_ops and remove its wrapper
rtw_hal_sreset_linked_status_check().
Call rtl8188e_sreset_linked_status_check() directly instead.

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


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

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

#include "../include/mlme_osdep.h"

#include "../include/recv_osdep.h"

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



static struct mlme_handler mlme_sta_tbl[] = {

	{WIFI_ASSOCREQ,		"OnAssocReq",	&OnAssocReq},
@@ -7400,7 +7401,7 @@ void linked_status_chk(struct adapter *padapter) 
	if (padapter->bRxRSSIDisplay)

		_linked_rx_signal_strehgth_display(padapter);



	rtw_hal_sreset_linked_status_check(padapter);

	rtl8188e_sreset_linked_status_check(padapter);



	if (is_client_associated_to_ap(padapter)) {

		/* linked infrastructure client mode */

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

{

	if (adapt->HalFunc.sreset_linked_status_check)

		adapt->HalFunc.sreset_linked_status_check(adapt);

}



u8   rtw_hal_sreset_get_wifi_status(struct adapter *adapt)

{

	u8 status = 0;

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_linked_status_check  = &rtl8188e_sreset_linked_status_check;

	pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;



	pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;

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

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



	int (*IOL_exec_cmds_sync)(struct adapter *padapter,
@@ -270,7 +269,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, 
				     struct wlan_bssid_ex *dst,

				     struct wlan_bssid_ex *src);



void rtw_hal_sreset_linked_status_check(struct adapter *padapter);

u8   rtw_hal_sreset_get_wifi_status(struct adapter *padapter);



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