Commit 03e9a558 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove dead code from ODM_Write_DIG() 



In this driver SupportPlatform is ODM_CE, so code in the
"else if (pDM_Odm->SupportPlatform & (ODM_AP | ODM_ADSL))" is never
executed. Remove it.

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


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

drivers/staging/r8188eu/hal/odm.c

+0 −34
Original line number Diff line number Diff line
@@ -460,21 +460,6 @@ void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) 
		pDM_Odm->bOneEntryOnly = false;

}



static int getIGIForDiff(int value_IGI)

{

	#define ONERCCA_LOW_TH		0x30

	#define ONERCCA_LOW_DIFF	8



	if (value_IGI < ONERCCA_LOW_TH) {

		if ((ONERCCA_LOW_TH - value_IGI) < ONERCCA_LOW_DIFF)

			return ONERCCA_LOW_TH;

		else

			return value_IGI + ONERCCA_LOW_DIFF;

	} else {

		return value_IGI;

	}

}



void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)

{

	struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
@@ -484,26 +469,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI) 
			ODM_SetBBReg(pDM_Odm, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), 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) {

			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)

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

				break;

			case ODM_CCA_1R_A:

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

				if (pDM_Odm->SupportICType != ODM_RTL8188E)

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

				break;

			case ODM_CCA_1R_B:

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

				if (pDM_Odm->SupportICType != ODM_RTL8188E)

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

				break;

			}

		}

		/* pDM_DigTable->PreIGValue = pDM_DigTable->CurIGValue; */

		pDM_DigTable->CurIGValue = CurrentIGI;

	}

/*  Add by Neil Chen to enable edcca to MP Platform */