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

staging: r8188eu: remove AntDivBeforeLinkHandler from hal_ops 



Remove AntDivBeforeLinkHandler from hal_ops and remove its wrapper
rtw_hal_antdiv_before_linked(). Call AntDivBeforeLink8188E() directly
instead.

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


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -6370,7 +6370,7 @@ void site_survey(struct adapter *padapter) 
			/*  20100721:Interrupt scan operation here. */

			/*  For SW antenna diversity before link, it needs to switch to another antenna and scan again. */

			/*  It compares the scan result and select beter one to do connection. */

			if (rtw_hal_antdiv_before_linked(padapter)) {

			if (AntDivBeforeLink8188E(padapter)) {

				pmlmeext->sitesurvey_res.bss_cnt = 0;

				pmlmeext->sitesurvey_res.channel_idx = -1;

				pmlmeext->chan_scan_time = SURVEY_TO / 2;

drivers/staging/r8188eu/hal/hal_intf.c

+0 −7
Original line number Diff line number Diff line
@@ -206,13 +206,6 @@ void rtw_hal_bcn_related_reg_setting(struct adapter *adapt) 
		adapt->HalFunc.SetBeaconRelatedRegistersHandler(adapt);

}



u8 rtw_hal_antdiv_before_linked(struct adapter *adapt)

{

	if (adapt->HalFunc.AntDivBeforeLinkHandler)

		return adapt->HalFunc.AntDivBeforeLinkHandler(adapt);

	return false;

}



void rtw_hal_antdiv_rssi_compared(struct adapter *adapt,

				  struct wlan_bssid_ex *dst,

				  struct wlan_bssid_ex *src)

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

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

	pHalFunc->cancel_thread = &rtl8188e_stop_thread;



	pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;

	pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;

	pHalFunc->read_bbreg = &rtl8188e_PHY_QueryBBReg;

	pHalFunc->write_bbreg = &rtl8188e_PHY_SetBBReg;

drivers/staging/r8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct hal_ops { 
	void	(*run_thread)(struct adapter *adapter);

	void	(*cancel_thread)(struct adapter *adapter);



	u8	(*AntDivBeforeLinkHandler)(struct adapter *adapter);

	void	(*AntDivCompareHandler)(struct adapter *adapter,

					struct wlan_bssid_ex *dst,

					struct wlan_bssid_ex *src);
@@ -256,7 +255,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, 
			    enum rf_radio_path eRFPath, u32 RegAddr,

			    u32 BitMask, u32 Data);



u8	rtw_hal_antdiv_before_linked(struct adapter *padapter);

void	rtw_hal_antdiv_rssi_compared(struct adapter *padapter,

				     struct wlan_bssid_ex *dst,

				     struct wlan_bssid_ex *src);