Commit 34a7eb3d authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO' 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 6e1acf20

drivers/staging/rtl8192e/r8192E_dev.c

+0 −26
Original line number Diff line number Diff line
@@ -166,24 +166,6 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) 
			priv->slot_time = val[0];

			write_nic_byte(dev, SLOT_TIME, val[0]);



#ifdef MERGE_TO_DO

			if (priv->rtllib->current_network.qos_data.supported !=0)

			{

				for (eACI = 0; eACI < AC_MAX; eACI++)

				{

					priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8*)(&eACI));

				}

			}

			else

			{

				u8	u1bAIFS = aSifsTime + (2 * priv->slot_time);



				write_nic_byte(dev, EDCAPARA_VO, u1bAIFS);

				write_nic_byte(dev, EDCAPARA_VI, u1bAIFS);

				write_nic_byte(dev, EDCAPARA_BE, u1bAIFS);

				write_nic_byte(dev, EDCAPARA_BK, u1bAIFS);

			}

#endif

		}

		break;
@@ -205,11 +187,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) 
		case HW_VAR_AC_PARAM:

		{

			u8	pAcParam = *((u8*)val);

#ifdef MERGE_TO_DO

			u32	eACI = GET_WMM_AC_PARAM_ACI(pAcParam);

#else

			u32	eACI = pAcParam;

#endif

			u8		u1bAIFS;

			u32		u4bAcParam;

			u8 mode = priv->rtllib->mode;
@@ -256,11 +234,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) 
		{

			struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters;

			u8	pAcParam = *((u8*)val);

#ifdef MERGE_TO_DO

			u32	eACI = GET_WMM_AC_PARAM_ACI(pAciAifsn);

#else

			u32	eACI = pAcParam;

#endif

			PACI_AIFSN	pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);

			u8		ACM = pAciAifsn->f.ACM;

			u8		AcmCtrl = read_nic_byte( dev, AcmHwCtrl);

drivers/staging/rtl8192e/rtl_ps.c

+0 −6
Original line number Diff line number Diff line
@@ -443,12 +443,6 @@ bool PlatformSwitchClkReq(struct net_device *dev, u8 value) 


	Buffer= value;



#ifdef MERGE_TO_DO

	if (Adapter->bDriverIsGoingToPnpSetPowerSleep && pDevice->RegSupportLowPowerState

		&& value == 0x0)

		return false;

#endif



	pci_write_config_byte(priv->pdev,0x81,value);

	bResult = true;

drivers/staging/rtl8192e/rtllib_rx.c

+0 −3
Original line number Diff line number Diff line
@@ -894,9 +894,6 @@ rtllib_FlushRxTsPendingPkts(struct rtllib_device *ieee, PRX_TS_RECORD pTS) 
	rtllib_indicate_packets(ieee, RfdArray, RfdCnt);



	pTS->RxIndicateSeq = 0xffff;



#ifdef MERGE_TO_DO

#endif

}