aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-12-11 15:23:13 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 15:23:13 -0500
commit460bb8df1e910a8c5d36ad363fbc1f0164cf0b85 (patch)
treef2abe4030d639f38071682f49c7d52d3fccbae48 /drivers/staging/rt2860
parent5a1322317abff17a6cdaf53bd33a4102d456ec23 (diff)
Staging: rt28x0: remove __LINE__ instances
Remove instances of __LINE__ preprocessor directive to make validation of resulting binary output files easier. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r--drivers/staging/rt2860/common/mlme.c7
-rw-r--r--drivers/staging/rt2860/common/rtmp_init.c3
-rw-r--r--drivers/staging/rt2860/pci_main_dev.c1
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index 9fa853eba67..9c250c2b329 100644
--- 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))
1222 { 1222 {
1223 if (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE) 1223 if (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)
1224 { 1224 {
1225 DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__)); 1225 DBGPRINT(RT_DEBUG_TRACE, ("%s\n", __func__));
1226
1227 RT28xxPciAsicRadioOff(pAd, GUI_IDLE_POWER_SAVE, 0); 1226 RT28xxPciAsicRadioOff(pAd, GUI_IDLE_POWER_SAVE, 0);
1228 } 1227 }
1229 else 1228 else
1230 { 1229 {
1231 DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__));
1232 AsicSendCommandToMcu(pAd, 0x30, PowerSafeCID, 0xff, 0x2); 1230 AsicSendCommandToMcu(pAd, 0x30, PowerSafeCID, 0xff, 0x2);
1233 // Wait command success 1231 // Wait command success
1234 AsicCheckCommanOk(pAd, PowerSafeCID); 1232 AsicCheckCommanOk(pAd, PowerSafeCID);
@@ -1240,12 +1238,11 @@ if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_PCIE_DEVICE))
1240 { 1238 {
1241 if (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE) 1239 if (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)
1242 { 1240 {
1243 DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__)); 1241 DBGPRINT(RT_DEBUG_TRACE, ("%s\n", __func__));
1244 RT28xxPciAsicRadioOff(pAd, GUI_IDLE_POWER_SAVE, 0); 1242 RT28xxPciAsicRadioOff(pAd, GUI_IDLE_POWER_SAVE, 0);
1245 } 1243 }
1246 else 1244 else
1247 { 1245 {
1248 DBGPRINT(RT_DEBUG_TRACE, ("%s::%d\n",__FUNCTION__,__LINE__));
1249 AsicSendCommandToMcu(pAd, 0x30, PowerSafeCID, 0xff, 0x02); 1246 AsicSendCommandToMcu(pAd, 0x30, PowerSafeCID, 0xff, 0x02);
1250 // Wait command success 1247 // Wait command success
1251 AsicCheckCommanOk(pAd, PowerSafeCID); 1248 AsicCheckCommanOk(pAd, PowerSafeCID);
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index 5deba8d698c..1cc6e44e257 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -1261,7 +1261,8 @@ VOID NICInitAsicFromEEPROM(
1261 && (pAd->StaCfg.PSControl.field.rt30xxPowerMode == 3) 1261 && (pAd->StaCfg.PSControl.field.rt30xxPowerMode == 3)
1262 && (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE)) 1262 && (pAd->StaCfg.PSControl.field.EnableNewPS == TRUE))
1263 { 1263 {
1264 DBGPRINT(RT_DEBUG_TRACE,("%s::%d,release Mcu Lock\n",__FUNCTION__,__LINE__)); 1264 DBGPRINT(RT_DEBUG_TRACE,
1265 ("%s, release Mcu Lock\n", __func__));
1265 RTMP_SEM_LOCK(&pAd->McuCmdLock); 1266 RTMP_SEM_LOCK(&pAd->McuCmdLock);
1266 pAd->brt30xxBanMcuCmd = FALSE; 1267 pAd->brt30xxBanMcuCmd = FALSE;
1267 RTMP_SEM_UNLOCK(&pAd->McuCmdLock); 1268 RTMP_SEM_UNLOCK(&pAd->McuCmdLock);
diff --git a/drivers/staging/rt2860/pci_main_dev.c b/drivers/staging/rt2860/pci_main_dev.c
index 38bc429067e..2c51d9d4f39 100644
--- a/drivers/staging/rt2860/pci_main_dev.c
+++ b/drivers/staging/rt2860/pci_main_dev.c
@@ -599,7 +599,6 @@ VOID RTMPInitPCIeLinkCtrlValue(
599 } 599 }
600 600
601 DBGPRINT(RT_DEBUG_TRACE, ("====> rt28xx Write 0x83 Command = 0x%x.\n", PCIePowerSaveLevel)); 601 DBGPRINT(RT_DEBUG_TRACE, ("====> rt28xx Write 0x83 Command = 0x%x.\n", PCIePowerSaveLevel));
602 printk("\n\n\n%s:%d\n",__FUNCTION__,__LINE__);
603 602
604 AsicSendCommandToMcu(pAd, 0x83, 0xff, (UCHAR)PCIePowerSaveLevel, 0x00); 603 AsicSendCommandToMcu(pAd, 0x83, 0xff, (UCHAR)PCIePowerSaveLevel, 0x00);
605 } 604 }