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

staging: r8188eu: remove unnecessary parentheses in hal dir 



Remove unnecessary parentheses in the hal directory reported by
checkpatch.

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


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

drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c

+4 −4
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ int ODM_RAInfo_Init(struct odm_dm_struct *dm_odm, u8 macid) 
	u8 WirelessMode = 0xFF; /* invalid value */

	u8 max_rate_idx = 0x13; /* MCS7 */

	if (dm_odm->pWirelessMode)

		WirelessMode = *(dm_odm->pWirelessMode);

		WirelessMode = *dm_odm->pWirelessMode;



	if (WirelessMode != 0xFF) {

		if (WirelessMode & ODM_WM_N24G)
@@ -580,7 +580,7 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rate 
	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return;



	pRaInfo = &(dm_odm->RAInfo[macid]);

	pRaInfo = &dm_odm->RAInfo[macid];

	pRaInfo->RateID = RateID;

	pRaInfo->RateMask = RateMask;

	pRaInfo->SGIEnable = SGIEnable;
@@ -594,7 +594,7 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi) 
	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return;



	pRaInfo = &(dm_odm->RAInfo[macid]);

	pRaInfo = &dm_odm->RAInfo[macid];

	pRaInfo->RssiStaRA = Rssi;

}
@@ -622,7 +622,7 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
		else

			valid = (1 << MacId) & macid_entry0;



		pRAInfo = &(dm_odm->RAInfo[MacId]);

		pRAInfo = &dm_odm->RAInfo[MacId];

		if (valid) {

			pRAInfo->RTY[0] = (u16)GET_TX_REPORT_TYPE1_RERTY_0(pBuffer);

			pRAInfo->RTY[1] = (u16)GET_TX_REPORT_TYPE1_RERTY_1(pBuffer);

drivers/staging/r8188eu/hal/HalPhyRf_8188e.c

+8 −8
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void ODM_TxPwrTrackAdjust88E(struct odm_dm_struct *dm_odm, u8 Type,/* 0 = OFDM, 
static void odm_TxPwrTrackSetPwr88E(struct odm_dm_struct *dm_odm)

{

	if (dm_odm->BbSwingFlagOfdm || dm_odm->BbSwingFlagCck) {

		PHY_SetTxPowerLevel8188E(dm_odm->Adapter, *(dm_odm->pChannel));

		PHY_SetTxPowerLevel8188E(dm_odm->Adapter, *dm_odm->pChannel);

		dm_odm->BbSwingFlagOfdm = false;

		dm_odm->BbSwingFlagCck	= false;

	}
@@ -318,7 +318,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( 
					X = dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].Value[0][4];

					Y = dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].Value[0][5];



					if ((X != 0) && (*(dm_odm->pBandType) == ODM_BAND_2_4G)) {

					if ((X != 0) && (*dm_odm->pBandType == ODM_BAND_2_4G)) {

						if ((X & 0x00000200) != 0)	/* consider minus */

							X = X | 0xFFFFFC00;

						ele_A = ((X * ele_D)>>8)&0x000003FF;
@@ -883,7 +883,7 @@ static void phy_IQCalibrate_8188E(struct adapter *adapt, s32 result[][8], u8 t, 
							};



	u32 retryCount = 9;

	if (*(dm_odm->mp_mode) == 1)

	if (*dm_odm->mp_mode == 1)

		retryCount = 9;

	else

		retryCount = 2;
@@ -1086,7 +1086,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) 
{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(adapt);

	struct odm_dm_struct *dm_odm = &pHalData->odmpriv;

	struct mpt_context *pMptCtx = &(adapt->mppriv.MptCtx);

	struct mpt_context *pMptCtx = &adapt->mppriv.MptCtx;

	s32 result[4][8];	/* last is final result */

	u8 i, final_candidate, Indexforchannel;

	bool pathaok, pathbok;
@@ -1108,7 +1108,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) 
	if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION))

		return;



	if (*(dm_odm->mp_mode) == 1) {

	if (*dm_odm->mp_mode == 1) {

		singletone = pMptCtx->bSingleTone;

		carrier_sup = pMptCtx->bCarrierSuppression;

	}
@@ -1219,9 +1219,9 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) 
	u32 timeout = 2000, timecount = 0;

	struct hal_data_8188e *pHalData = GET_HAL_DATA(adapt);

	struct odm_dm_struct *dm_odm = &pHalData->odmpriv;

	struct mpt_context *pMptCtx = &(adapt->mppriv.MptCtx);

	struct mpt_context *pMptCtx = &adapt->mppriv.MptCtx;



	if (*(dm_odm->mp_mode) == 1) {

	if (*dm_odm->mp_mode == 1) {

		singletone = pMptCtx->bSingleTone;

		carrier_sup = pMptCtx->bCarrierSuppression;

	}
@@ -1231,7 +1231,7 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) 
	if (singletone || carrier_sup)

		return;



	while (*(dm_odm->pbScanInProcess) && timecount < timeout) {

	while (*dm_odm->pbScanInProcess && timecount < timeout) {

		ODM_delay_ms(50);

		timecount += 50;

	}

drivers/staging/r8188eu/hal/hal_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void rtw_hal_free_recv_priv(struct adapter *adapt) 


void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)

{

	struct mlme_priv *pmlmepriv = &(adapt->mlmepriv);

	struct mlme_priv *pmlmepriv = &adapt->mlmepriv;



	if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {

#ifdef CONFIG_88EU_AP_MODE

drivers/staging/r8188eu/hal/odm.c

+22 −22
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm) 
		odm_DIG(pDM_Odm);

	odm_CCKPacketDetectionThresh(pDM_Odm);



	if (*(pDM_Odm->pbPowerSaving))

	if (*pDM_Odm->pbPowerSaving)

		return;



	odm_RefreshRateAdaptiveMask(pDM_Odm);
@@ -440,13 +440,13 @@ void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) 
	u8 i;

	struct sta_info *pEntry;



	if (*(pDM_Odm->pBandWidth) == ODM_BW40M) {

		if (*(pDM_Odm->pSecChOffset) == 1)

			pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) - 2;

		else if (*(pDM_Odm->pSecChOffset) == 2)

			pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) + 2;

	if (*pDM_Odm->pBandWidth == ODM_BW40M) {

		if (*pDM_Odm->pSecChOffset == 1)

			pDM_Odm->ControlChannel = *pDM_Odm->pChannel - 2;

		else if (*pDM_Odm->pSecChOffset == 2)

			pDM_Odm->ControlChannel = *pDM_Odm->pChannel + 2;

	} else {

		pDM_Odm->ControlChannel = *(pDM_Odm->pChannel);

		pDM_Odm->ControlChannel = *pDM_Odm->pChannel;

	}



	for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {
@@ -485,7 +485,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI) 
				if (pDM_Odm->SupportICType != ODM_RTL8188E)

				ODM_SetBBReg(pDM_Odm, ODM_REG(IGI_B, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);

		} else if (pDM_Odm->SupportPlatform & (ODM_AP|ODM_ADSL)) {

			switch (*(pDM_Odm->pOnePathCCA)) {

			switch (*pDM_Odm->pOnePathCCA) {

			case ODM_CCA_2R:

				ODM_SetBBReg(pDM_Odm, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);

					if (pDM_Odm->SupportICType != ODM_RTL8188E)
@@ -602,7 +602,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
	if ((!(pDM_Odm->SupportAbility&ODM_BB_DIG)) || (!(pDM_Odm->SupportAbility&ODM_BB_FA_CNT)))

		return;



	if (*(pDM_Odm->pbScanInProcess))

	if (*pDM_Odm->pbScanInProcess)

		return;



	/* add by Neil Chen to avoid PSD is processing */
@@ -610,8 +610,8 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
		return;



	if (pDM_Odm->SupportICType == ODM_RTL8192D) {

		if (*(pDM_Odm->pMacPhyMode) == ODM_DMSP) {

			if (*(pDM_Odm->pbMasterOfDMSP)) {

		if (*pDM_Odm->pMacPhyMode == ODM_DMSP) {

			if (*pDM_Odm->pbMasterOfDMSP) {

				DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0;

				FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_0);

				FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0);
@@ -621,7 +621,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_1);

			}

		} else {

			if (*(pDM_Odm->pBandType) == ODM_BAND_5G) {

			if (*pDM_Odm->pBandType == ODM_BAND_5G) {

				DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0;

				FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_0);

				FirstDisConnect = (!pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0);
@@ -791,7 +791,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)

{

	u32 ret_value;

	struct false_alarm_stats *FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;



	if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))

		return;
@@ -884,7 +884,7 @@ void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm) 
void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm)

{

	u8 CurCCK_CCAThres;

	struct false_alarm_stats *FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;



	if (!(pDM_Odm->SupportAbility & (ODM_BB_CCK_PD|ODM_BB_FA_CNT)))

		return;
@@ -1116,7 +1116,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u 
			} else if (rssi_level == DM_RATR_STA_MIDDLE) {

				rate_bitmap = 0x000ff000;

			} else {

				if (*(pDM_Odm->pBandWidth) == ODM_BW40M)

				if (*pDM_Odm->pBandWidth == ODM_BW40M)

					rate_bitmap = 0x000ff015;

				else

					rate_bitmap = 0x000ff005;
@@ -1127,7 +1127,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u 
			} else if (rssi_level == DM_RATR_STA_MIDDLE) {

				rate_bitmap = 0x0f8ff000;

			} else {

				if (*(pDM_Odm->pBandWidth) == ODM_BW40M)

				if (*pDM_Odm->pBandWidth == ODM_BW40M)

					rate_bitmap = 0x0f8ff015;

				else

					rate_bitmap = 0x0f8ff005;
@@ -1402,7 +1402,7 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm) 
				/*  Report every sta's RSSI to FW */

			} else {

				ODM_RA_SetRSSI_8188E(

				&(pHalData->odmpriv), (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));

				&pHalData->odmpriv, (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));

			}

		}

	}
@@ -1456,7 +1456,7 @@ void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_Odm) 
	pDM_Odm->RFCalibrateInfo.bTXPowerTracking = true;

	pDM_Odm->RFCalibrateInfo.TXPowercount = 0;

	pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = false;

	if (*(pDM_Odm->mp_mode) != 1)

	if (*pDM_Odm->mp_mode != 1)

		pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true;

	MSG_88E("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl);
@@ -1624,11 +1624,11 @@ void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm) 
	u64	cur_rx_bytes = 0;

	u8	bbtchange = false;

	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);

	struct xmit_priv		*pxmitpriv = &(Adapter->xmitpriv);

	struct recv_priv		*precvpriv = &(Adapter->recvpriv);

	struct xmit_priv		*pxmitpriv = &Adapter->xmitpriv;

	struct recv_priv		*precvpriv = &Adapter->recvpriv;

	struct registry_priv	*pregpriv = &Adapter->registrypriv;

	struct mlme_ext_priv	*pmlmeext = &(Adapter->mlmeextpriv);

	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);

	struct mlme_ext_priv	*pmlmeext = &Adapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;



	if (pregpriv->wifi_spec == 1)

		goto dm_CheckEdcaTurbo_EXIT;

drivers/staging/r8188eu/hal/odm_RTL8188E.c

+5 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm) 
{

	u32	value32;



	if (*(dm_odm->mp_mode) == 1) {

	if (*dm_odm->mp_mode == 1) {

		dm_odm->AntDivType = CGCS_RX_SW_ANTDIV;

		ODM_SetBBReg(dm_odm, ODM_REG_IGI_A_11N, BIT7, 0); /*  disable HW AntDiv */

		ODM_SetBBReg(dm_odm, ODM_REG_LNA_SWITCH_11N, BIT31, 1);  /*  1:CG, 0:CS */
@@ -44,7 +44,7 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm) 
{

	u32	value32;



	if (*(dm_odm->mp_mode) == 1) {

	if (*dm_odm->mp_mode == 1) {

		dm_odm->AntDivType = CGCS_RX_SW_ANTDIV;

		ODM_SetBBReg(dm_odm, ODM_REG_IGI_A_11N, BIT7, 0); /*  disable HW AntDiv */

		ODM_SetBBReg(dm_odm, ODM_REG_RX_ANT_CTRL_11N, BIT5|BIT4|BIT3, 0); /* Default RX   (0/1) */
@@ -83,7 +83,7 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm) 
	struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;

	u32	AntCombination = 2;



	if (*(dm_odm->mp_mode) == 1)

	if (*dm_odm->mp_mode == 1)

		return;



	for (i = 0; i < 6; i++) {
@@ -327,7 +327,7 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm) 


void odm_PrimaryCCA_Init(struct odm_dm_struct *dm_odm)

{

	struct dyn_primary_cca *PrimaryCCA = &(dm_odm->DM_PriCCA);

	struct dyn_primary_cca *PrimaryCCA = &dm_odm->DM_PriCCA;



	PrimaryCCA->DupRTS_flag = 0;

	PrimaryCCA->intf_flag = 0;
@@ -338,7 +338,7 @@ void odm_PrimaryCCA_Init(struct odm_dm_struct *dm_odm) 


bool ODM_DynamicPrimaryCCA_DupRTS(struct odm_dm_struct *dm_odm)

{

	struct dyn_primary_cca *PrimaryCCA = &(dm_odm->DM_PriCCA);

	struct dyn_primary_cca *PrimaryCCA = &dm_odm->DM_PriCCA;



	return	PrimaryCCA->DupRTS_flag;

}