rtl8192e: Remove occurences of #if 1

Signed-off-by: Mike McCormack <mikem@ring3k.org>
git-mirror · Aug 24, 2011 · 4f6807e · 4f6807e
1 parent 3591733
commit 4f6807e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 651 deletions.
diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c
@@ -1394,7 +1394,6 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
 
 	}
 
-#if 1
 	switch ( priv->rf_chip )
 	{
 		case RF_8225:
@@ -1417,7 +1416,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
 			RT_TRACE(COMP_ERR, "Unknown RFChipID: %d\n", priv->rf_chip);
 			break;
 	}
-#endif
+
 	atomic_dec(&(priv->rtllib->atm_swbw));
 	priv->SetBWModeInProgress= false;
 

diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -540,7 +540,7 @@ void RemovePeerTS(struct rtllib_device* ieee, u8* Addr)
 {
 	PTS_COMMON_INFO	pTS, pTmpTS;
 	printk("===========>RemovePeerTS,"MAC_FMT"\n", MAC_ARG(Addr));
-#if 1
+
 	list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List)
 	{
 		if (memcmp(pTS->Addr, Addr, 6) == 0)
@@ -581,13 +581,12 @@ void RemovePeerTS(struct rtllib_device* ieee, u8* Addr)
 			list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List);
 		}
 	}
-#endif
 }
 
 void RemoveAllTS(struct rtllib_device* ieee)
 {
 	PTS_COMMON_INFO pTS, pTmpTS;
-#if 1
+
 	list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List)
 	{
 		RemoveTsEntry(ieee, pTS, TX_DIR);
@@ -615,15 +614,14 @@ void RemoveAllTS(struct rtllib_device* ieee)
 		list_del_init(&pTS->List);
 		list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List);
 	}
-#endif
 }
 
 void TsStartAddBaProcess(struct rtllib_device* ieee, PTX_TS_RECORD	pTxTS)
 {
 	if (pTxTS->bAddBaReqInProgress == false)
 	{
 		pTxTS->bAddBaReqInProgress = true;
-#if 1
+
 		if (pTxTS->bAddBaReqDelayed)
 		{
 			RTLLIB_DEBUG(RTLLIB_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");
@@ -634,7 +632,6 @@ void TsStartAddBaProcess(struct rtllib_device* ieee, PTX_TS_RECORD	pTxTS)
 			RTLLIB_DEBUG(RTLLIB_DL_BA,"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n");
 			mod_timer(&pTxTS->TsAddBaTimer, jiffies+10);
 		}
-#endif
 	}
 	else
 		RTLLIB_DEBUG(RTLLIB_DL_BA, "%s()==>BA timer is already added\n", __func__);

diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
@@ -398,7 +398,7 @@ MgntActSet_RF_State(
 		{
 			spin_unlock_irqrestore(&priv->rf_ps_lock,flag);
 			RT_TRACE((COMP_PS | COMP_RF), "MgntActSet_RF_State(): RF Change in progress! Wait to set..StateToSet(%d).\n", StateToSet);
-			#if 1
+
 			while(priv->RFChangeInProgress)
 			{
 				RFWaitCounter ++;
@@ -411,7 +411,6 @@ MgntActSet_RF_State(
 					return false;
 				}
 			}
-			#endif
 		}
 		else
 		{
@@ -2796,7 +2795,7 @@ void rtl8192_rx_normal(struct net_device *dev)
 			}else{
 				dev_kfree_skb_any(skb);
 			}
-#if 1
+
 			new_skb = dev_alloc_skb(priv->rxbuffersize);
 			if (unlikely(!new_skb))
 			{
@@ -2805,7 +2804,7 @@ void rtl8192_rx_normal(struct net_device *dev)
 			}
 			skb=new_skb;
                         skb->dev = dev;
-#endif
+
 			priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] = skb;
 			*((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer_rsl(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE);
 

diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c
@@ -469,10 +469,8 @@ static void dm_check_rate_adaptive(struct net_device * dev)
 			}
 		}
 
-#if 1
 		if (priv->rtllib->GetHalfNmodeSupportByAPsHandler(dev))
 			targetRATR &=  0xf00fffff;
-#endif
 
 		currentRATR = read_nic_dword(dev, RATR0);
 		if ( targetRATR !=  currentRATR )
@@ -2983,7 +2981,6 @@ extern void dm_init_edca_turbo(struct net_device * dev)
 	priv->bis_cur_rdlstate = false;
 }
 
-#if 1
 static void dm_check_edca_turbo(
 	struct net_device * dev)
 {
@@ -3086,7 +3083,6 @@ static void dm_check_edca_turbo(
 	lastTxOkCnt = priv->stats.txbytesunicast;
 	lastRxOkCnt = priv->stats.rxbytesunicast;
 }
-#endif
 
 extern void DM_CTSToSelfSetting(struct net_device * dev,u32 DM_Type, u32 DM_Value)
 {
@@ -3138,18 +3134,7 @@ static void dm_ctstoself(struct net_device *dev)
 		}
 		else
 		{
-		#if 1
 			pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;
-		#else
-			if (priv->undecorated_smoothed_pwdb < priv->rtllib->CTSToSelfTH)
-			{
-				pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
-			}
-			else if (priv->undecorated_smoothed_pwdb >= (priv->rtllib->CTSToSelfTH+5))
-			{
-				pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;
-			}
-		#endif
 		}
 
 		lastTxOkCnt = priv->stats.txbytesunicast;

diff --git a/drivers/staging/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl_ps.c
@@ -460,10 +460,8 @@ PlatformDisableASPM(struct net_device *dev)
 {
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 	PRT_POWER_SAVE_CONTROL	pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->rtllib->PowerSaveControl));
-#if 1
 	u32	PciCfgAddrPort=0;
 	u8	Num4Bytes;
-#endif
 	u8	LinkCtrlReg;
 	u16	PciBridgeLinkCtrlReg, ASPMLevel=0;