Staging: rt28x0: remove __LINE__ instances

commit 460bb8d upstream. Remove instances of __LINE__ preprocessor directive to make validation of resulting binary output files easier. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
blinkosm · Mar 12, 2011 · bb727db · bb727db
1 parent 91a71f7
commit bb727db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
@@ -1222,13 +1222,11 @@ if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_PCIE_DEVICE))
 			{
 			if (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)
 	{
-				DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__));
-
+				DBGPRINT(RT_DEBUG_TRACE, ("%s\n", __func__));
 				RT28xxPciAsicRadioOff(pAd, GUI_IDLE_POWER_SAVE, 0);
 				}
 			else
 				{
-				DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__));
 				AsicSendCommandToMcu(pAd, 0x30, PowerSafeCID, 0xff, 0x2);
 				// Wait command success
 				AsicCheckCommanOk(pAd, PowerSafeCID);
@@ -1240,12 +1238,11 @@ if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_PCIE_DEVICE))
                 {
 			if (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)
 				{
-				DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__));
+				DBGPRINT(RT_DEBUG_TRACE, ("%s\n", __func__));
 				RT28xxPciAsicRadioOff(pAd, GUI_IDLE_POWER_SAVE, 0);
 				 }
 				else
 				{
-				DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__));
 				AsicSendCommandToMcu(pAd, 0x30, PowerSafeCID, 0xff, 0x02);
 				// Wait command success
 				AsicCheckCommanOk(pAd, PowerSafeCID);

diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
@@ -1261,7 +1261,8 @@ VOID	NICInitAsicFromEEPROM(
 			&& (pAd->StaCfg.PSControl.field.rt30xxPowerMode == 3)
 			&& (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE))
 		{
-			DBGPRINT(RT_DEBUG_TRACE,("%s::%d,release Mcu Lock\n",__FUNCTION__,__LINE__));
+			DBGPRINT(RT_DEBUG_TRACE,
+				("%s, release Mcu Lock\n", __func__));
 			RTMP_SEM_LOCK(&pAd->McuCmdLock);
 			pAd->brt30xxBanMcuCmd = FALSE;
 			RTMP_SEM_UNLOCK(&pAd->McuCmdLock);

diff --git a/drivers/staging/rt2860/pci_main_dev.c b/drivers/staging/rt2860/pci_main_dev.c
@@ -599,7 +599,6 @@ VOID RTMPInitPCIeLinkCtrlValue(
 				}
 
 				DBGPRINT(RT_DEBUG_TRACE, ("====> rt28xx Write 0x83 Command = 0x%x.\n", PCIePowerSaveLevel));
-					       printk("\n\n\n%s:%d\n",__FUNCTION__,__LINE__);
 
 				AsicSendCommandToMcu(pAd, 0x83, 0xff, (UCHAR)PCIePowerSaveLevel, 0x00);
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -599,7 +599,6 @@ VOID RTMPInitPCIeLinkCtrlValue( @@
     				}
     				DBGPRINT(RT_DEBUG_TRACE, ("====> rt28xx Write 0x83 Command = 0x%x.\n", PCIePowerSaveLevel));
-    					       printk("\n\n\n%s:%d\n",__FUNCTION__,__LINE__);
     				AsicSendCommandToMcu(pAd, 0x83, 0xff, (UCHAR)PCIePowerSaveLevel, 0x00);
     			}
@@ Expand Down @@