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

staging: r8188eu: remove GetHalDefVarHandler from struct hal_ops 



Remove GetHalDefVarHandler from struct hal_ops and remove its wrapper
rtw_hal_get_def_var(). Call GetHalDefVar8188EUsb() directly instead.

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


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

drivers/staging/r8188eu/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue) 
	u8	support_ant_div;

	u8	res = _SUCCESS;



	rtw_hal_get_def_var(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_div);

	GetHalDefVar8188EUsb(padapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &support_ant_div);

	if (!support_ant_div)

		return res;

drivers/staging/r8188eu/core/rtw_mlme.c

+7 −7
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
			/* If there are no more slots, expire the oldest */

			pnetwork = oldest;



			rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo.Optimum_antenna);

			GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo.Optimum_antenna);

			memcpy(&pnetwork->network, target,  get_wlan_bssid_ex_sz(target));

			/*  variable initialize */

			pnetwork->fixed = false;
@@ -527,7 +527,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 


			bssid_ex_sz = get_wlan_bssid_ex_sz(target);

			target->Length = bssid_ex_sz;

			rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo.Optimum_antenna);

			GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &target->PhyInfo.Optimum_antenna);

			memcpy(&pnetwork->network, target, bssid_ex_sz);



			pnetwork->last_scanned = jiffies;
@@ -1539,10 +1539,10 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 
		rtw_free_assoc_resources(adapter, 0);

	}



	rtw_hal_get_def_var(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &(supp_ant_div));

	GetHalDefVar8188EUsb(adapter, HAL_DEF_IS_SUPPORT_ANT_DIV, &supp_ant_div);

	if (supp_ant_div) {

		u8 cur_ant;

		rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(cur_ant));

		GetHalDefVar8188EUsb(adapter, HAL_DEF_CURRENT_ANTENNA, &cur_ant);

		DBG_88E("#### Opt_Ant_(%s), cur_Ant(%s)\n",

			(2 == candidate->network.PhyInfo.Optimum_antenna) ? "A" : "B",

			(2 == cur_ant) ? "A" : "B"
@@ -1923,15 +1923,15 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
						IEEE80211_HT_CAP_TX_STBC |

						IEEE80211_HT_CAP_DSSSCCK40);



		rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);

		rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);

		GetHalDefVar8188EUsb(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);

		GetHalDefVar8188EUsb(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);



		/*

		AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k

		AMPDU_para [4:2]:Min MPDU Start Spacing

		*/



		rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);

		GetHalDefVar8188EUsb(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);

		ht_capie.ampdu_params_info = (max_rx_ampdu_factor & 0x03);



		if (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+4 −4
Original line number Diff line number Diff line
@@ -5807,7 +5807,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch 
			pframe = rtw_set_fixed_ie(pframe, 1, &pmlmeinfo->ADDBA_req.dialog_token, &pattrib->pktlen);

			pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)&status, &pattrib->pktlen);

			BA_para_set = le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f;

			rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);

			GetHalDefVar8188EUsb(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);

			switch (max_rx_ampdu_factor) {

			case MAX_AMPDU_FACTOR_64K:

				BA_para_set |= 0x1000; /* 64 buffer size */
@@ -6263,7 +6263,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st 
	bssid->Rssi = precv_frame->attrib.phy_info.recvpower; /*  in dBM.raw data */

	bssid->PhyInfo.SignalQuality = precv_frame->attrib.phy_info.SignalQuality;/* in percentage */

	bssid->PhyInfo.SignalStrength = precv_frame->attrib.phy_info.SignalStrength;/* in percentage */

	rtw_hal_get_def_var(padapter, HAL_DEF_CURRENT_ANTENNA,  &bssid->PhyInfo.Optimum_antenna);

	GetHalDefVar8188EUsb(padapter, HAL_DEF_CURRENT_ANTENNA,  &bssid->PhyInfo.Optimum_antenna);



	/*  checking SSID */

	p = rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset);
@@ -7154,9 +7154,9 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter) 
	else if ((pmlmeinfo->state & 0x03) == _HW_STATE_AP_)

		mac_id = 2;



	rtw_hal_get_def_var(padapter, HW_DEF_RA_INFO_DUMP, &mac_id);

	GetHalDefVar8188EUsb(padapter, HW_DEF_RA_INFO_DUMP, &mac_id);



	rtw_hal_get_def_var(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB);

	GetHalDefVar8188EUsb(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB);

	DBG_88E("UndecoratedSmoothedPWDB:%d\n", UndecoratedSmoothedPWDB);

}

drivers/staging/r8188eu/core/rtw_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv 
	pattrib->order = GetOrder(ptr);



	/* Dump rx packets */

	rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));

	GetHalDefVar8188EUsb(adapter, HAL_DEF_DBG_DUMP_RXPKT, &bDumpRxPkt);

	if (bDumpRxPkt == 1) {/* dump all rx packets */

		int i;

		DBG_88E("#############################\n");

drivers/staging/r8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ void rtw_hal_get_hwreg(struct adapter *adapt, u8 variable, u8 *val) 
		adapt->HalFunc.GetHwRegHandler(adapt, variable, val);

}



u8 rtw_hal_get_def_var(struct adapter *adapt,

		       enum hal_def_variable var, void *val)

{

	if (adapt->HalFunc.GetHalDefVarHandler)

		return adapt->HalFunc.GetHalDefVarHandler(adapt, var, val);

	return _FAIL;

}



u32 rtw_hal_inirp_init(struct adapter *adapt)

{

	u32 rst = _FAIL;