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

staging: r8188eu: remove Hal_MPT_CCKTxPowerAdjustbyIndex() 



IC Type is always 8188E. Therefore, the test
"if (!IS_92C_SERIAL(pHalData->VersionID))" in
Hal_MPT_CCKTxPowerAdjustbyIndex() is always true and the function
does nothing, remove it.

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


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

drivers/staging/r8188eu/hal/rtl8188e_mp.c

+0 −71
Original line number Diff line number Diff line
@@ -130,73 +130,6 @@ void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, bool bInCH14) 
	write_bbreg(Adapter, rCCK0_TxFilter2, bMaskDWord, TempVal2);

	write_bbreg(Adapter, rCCK0_DebugPort, bMaskLWord, TempVal3);

}



void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven)

{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);

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

	struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;

	s32		TempCCk;

	u8		CCK_index, CCK_index_old = 0;

	u8		Action = 0;	/* 0: no action, 1: even->odd, 2:odd->even */

	s32		i = 0;



	if (!IS_92C_SERIAL(pHalData->VersionID))

		return;

	if (beven && !pMptCtx->bMptIndexEven) {

		/* odd->even */

		Action = 2;

		pMptCtx->bMptIndexEven = true;

	} else if (!beven && pMptCtx->bMptIndexEven) {

		/* even->odd */

		Action = 1;

		pMptCtx->bMptIndexEven = false;

	}



	if (Action != 0) {

		/* Query CCK default setting From 0xa24 */

		TempCCk = read_bbreg(pAdapter, rCCK0_TxFilter2, bMaskDWord) & bMaskCCK;

		for (i = 0; i < CCK_TABLE_SIZE; i++) {

			if (pDM_Odm->RFCalibrateInfo.bCCKinCH14) {

				if (!memcmp((void *)&TempCCk, (void *)&CCKSwingTable_Ch14[i][2], 4)) {

					CCK_index_old = (u8)i;

					break;

				}

			} else {

				if (!memcmp((void *)&TempCCk, (void *)&CCKSwingTable_Ch1_Ch13[i][2], 4)) {

					CCK_index_old = (u8)i;

					break;

				}

			}

		}



		if (Action == 1)

			CCK_index = CCK_index_old - 1;

		else

			CCK_index = CCK_index_old + 1;



		/* Adjust CCK according to gain index */

		if (!pDM_Odm->RFCalibrateInfo.bCCKinCH14) {

			rtw_write8(pAdapter, 0xa22, CCKSwingTable_Ch1_Ch13[CCK_index][0]);

			rtw_write8(pAdapter, 0xa23, CCKSwingTable_Ch1_Ch13[CCK_index][1]);

			rtw_write8(pAdapter, 0xa24, CCKSwingTable_Ch1_Ch13[CCK_index][2]);

			rtw_write8(pAdapter, 0xa25, CCKSwingTable_Ch1_Ch13[CCK_index][3]);

			rtw_write8(pAdapter, 0xa26, CCKSwingTable_Ch1_Ch13[CCK_index][4]);

			rtw_write8(pAdapter, 0xa27, CCKSwingTable_Ch1_Ch13[CCK_index][5]);

			rtw_write8(pAdapter, 0xa28, CCKSwingTable_Ch1_Ch13[CCK_index][6]);

			rtw_write8(pAdapter, 0xa29, CCKSwingTable_Ch1_Ch13[CCK_index][7]);

		} else {

			rtw_write8(pAdapter, 0xa22, CCKSwingTable_Ch14[CCK_index][0]);

			rtw_write8(pAdapter, 0xa23, CCKSwingTable_Ch14[CCK_index][1]);

			rtw_write8(pAdapter, 0xa24, CCKSwingTable_Ch14[CCK_index][2]);

			rtw_write8(pAdapter, 0xa25, CCKSwingTable_Ch14[CCK_index][3]);

			rtw_write8(pAdapter, 0xa26, CCKSwingTable_Ch14[CCK_index][4]);

			rtw_write8(pAdapter, 0xa27, CCKSwingTable_Ch14[CCK_index][5]);

			rtw_write8(pAdapter, 0xa28, CCKSwingTable_Ch14[CCK_index][6]);

			rtw_write8(pAdapter, 0xa29, CCKSwingTable_Ch14[CCK_index][7]);

		}

	}

}

/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/



/*
@@ -311,8 +244,6 @@ void Hal_SetAntennaPathPower(struct adapter *pAdapter) 
	case RF_8256:

	case RF_6052:

		Hal_SetCCKTxPower(pAdapter, TxPowerLevel);

		if (pAdapter->mppriv.rateidx < MPT_RATE_6M)	/*  CCK rate */

			Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter, TxPowerLevel[rfPath] % 2 == 0);

		Hal_SetOFDMTxPower(pAdapter, TxPowerLevel);

		break;

	default:
@@ -350,8 +281,6 @@ void Hal_SetTxPower(struct adapter *pAdapter) 
	case RF_8256:

	case RF_6052:

		Hal_SetCCKTxPower(pAdapter, TxPowerLevel);

		if (pAdapter->mppriv.rateidx < MPT_RATE_6M)	/*  CCK rate */

			Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter, TxPowerLevel[rfPath] % 2 == 0);

		Hal_SetOFDMTxPower(pAdapter, TxPowerLevel);

		break;

	default:

drivers/staging/r8188eu/include/rtw_mp.h

+0 −1
Original line number Diff line number Diff line
@@ -460,7 +460,6 @@ void Hal_GetPowerTracking(struct adapter *padapter, u8 * enable); 
void Hal_GetThermalMeter(struct adapter *pAdapter, u8 *value);

void Hal_mpt_SwitchRfSetting(struct adapter *pAdapter);

void Hal_MPT_CCKTxPowerAdjust(struct adapter * Adapter, bool bInCH14);

void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven);

void Hal_SetCCKTxPower(struct adapter *pAdapter, u8 * TxPower);

void Hal_SetOFDMTxPower(struct adapter *pAdapter, u8 * TxPower);

void Hal_TriggerRFThermalMeter(struct adapter *pAdapter);