Staging: rtxxx0: debug messages fixes

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 872349a9cc6af59f620af1d3531928747af94796..79a51640f6bc41c5eba731e07a7db99e2ae1a3d7 100644 (file)
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -531,12 +531,10 @@ VOID BAOriSessionSetUp(
        pBAEntry->TimeOutValue = TimeOut;
        pBAEntry->pAdapter = pAd;
 
-#ifdef RT30xx
        DBGPRINT(RT_DEBUG_TRACE,("Send AddBA to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d isForced:%d Wcid:%d\n"
                ,pEntry->Addr[0],pEntry->Addr[1],pEntry->Addr[2]
                ,pEntry->Addr[3],pEntry->Addr[4],pEntry->Addr[5]
                ,TID,isForced,pEntry->Aid));
-#endif
 
        if (!(pEntry->TXBAbitmap & (1<<TID)))
        {
@@ -1078,16 +1076,11 @@ VOID BAOriSessionSetupTimeout(
                AddbaReq.Token = pBAEntry->Token;
                MlmeEnqueue(pAd, ACTION_STATE_MACHINE, MT2_MLME_ADD_BA_CATE, sizeof(MLME_ADDBA_REQ_STRUCT), (PVOID)&AddbaReq);
                RT28XX_MLME_HANDLER(pAd);
-#ifndef RT30xx
-               DBGPRINT(RT_DEBUG_TRACE,("BA Ori Session Timeout(%d) : Send ADD BA again\n", pBAEntry->Token));
-#endif
-#ifdef RT30xx
                DBGPRINT(RT_DEBUG_TRACE,("BA Ori Session Timeout(%d) to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d Wcid:%d\n"
                ,pBAEntry->Token
                ,pEntry->Addr[0],pEntry->Addr[1],pEntry->Addr[2]
                ,pEntry->Addr[3],pEntry->Addr[4],pEntry->Addr[5]
                ,pBAEntry->TID,pEntry->Aid));
-#endif
                pBAEntry->Token++;
                RTMPSetTimer(&pBAEntry->ORIBATimer, ORI_BA_SESSION_TIMEOUT);
        }

diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index 0a6da1a9b46ac582e21c19c2f738bc23d8c349fe..d6d8ca6eadde7aed4991465dfb52a894a5a3dfe0 100644 (file)
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -2813,9 +2813,8 @@ VOID MlmeSetPsmBit(
        RTMP_IO_READ32(pAd, AUTO_RSP_CFG, &csr4.word);
        csr4.field.AckCtsPsmBit = (psm == PWR_SAVE)? 1:0;
        RTMP_IO_WRITE32(pAd, AUTO_RSP_CFG, csr4.word);
-#ifndef RT30xx
+
        DBGPRINT(RT_DEBUG_TRACE, ("MlmeSetPsmBit = %d\n", psm));
-#endif
 }
 
 // IRQL = DISPATCH_LEVEL
@@ -5806,14 +5805,7 @@ VOID AsicSwitchChannel(
 #endif
 
        if (index == MAX_NUM_OF_CHANNELS)
-       {
-#ifndef RT30xx
-               DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Cant find the Channel#%d \n", Channel));
-#endif
-#ifdef RT30xx
                DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Can't find the Channel#%d \n", Channel));
-#endif
-       }
 
 #ifdef RT2870
        // The RF programming sequence is difference between 3xxx and 2xxx
@@ -5935,7 +5927,6 @@ VOID AsicSwitchChannel(
                        }
                }
 
-#ifndef RT30xx
                DBGPRINT(RT_DEBUG_TRACE, ("SwitchChannel#%d(RF=%d, Pwr0=%d, Pwr1=%d, %dT), N=0x%02X, K=0x%02X, R=0x%02X\n",
                        Channel,
                        pAd->RfIcType,
@@ -5945,7 +5936,6 @@ VOID AsicSwitchChannel(
                        FreqItems3020[index].N,
                        FreqItems3020[index].K,
                        FreqItems3020[index].R));
-#endif
        }
        else
 #endif // RT2870 //
@@ -9075,11 +9065,9 @@ VOID AsicTurnOnRFClk(
                        break;
        }
 
-#ifndef RT30xx
        DBGPRINT(RT_DEBUG_TRACE, ("AsicTurnOnRFClk#%d(RF=%d, ) , R2=0x%08x\n",
                Channel,
                pAd->RfIcType,
                R2));
-#endif
 }
 

diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c
index 101c2923ca370f3e9af0b053cb2a75e6e54903c5..c658bf3082c31debc547042722966327939839c2 100644 (file)
--- a/drivers/staging/rt2860/common/spectrum.c
+++ b/drivers/staging/rt2860/common/spectrum.c
@@ -1570,12 +1570,7 @@ static VOID PeerMeasureReportAction(
 
        if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL)
        {
-#ifndef RT30xx
                DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%zu).\n", __func__, sizeof(MEASURE_RPI_REPORT)));
-#endif
-#ifdef RT30xx
-               DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __func__, sizeof(MEASURE_RPI_REPORT)));
-#endif
                return;
        }
 

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index be5a1b6f312d84247a1bf0f71fdcd96b8efb6bb8..d7d9b901a014ecfbb410061a0481c3737e1ae932 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -826,12 +826,7 @@ void send_monitor_packets(
 
     if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE)
     {
-#ifndef RT30xx
         DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%zu)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));
-#endif
-#ifdef RT30xx
-        DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));
-#endif
                goto err_free_sk_buff;
     }
 

diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index 87b5e49cec54350189671be2b77bb60841dccd01..a6e4362fc5cc19e069857bc20cbcceddfda006c8 100644 (file)
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -1116,10 +1116,8 @@ VOID PeerBeacon(
                        // Add the safeguard against the mismatch of adhoc wep status
                        if (pAd->StaCfg.WepStatus != pAd->ScanTab.BssEntry[Bssidx].WepStatus)
                        {
-#ifdef RT30xx
                                DBGPRINT(RT_DEBUG_TRACE, ("SYNC - Not matched wep status %d %d\n", pAd->StaCfg.WepStatus, pAd->ScanTab.BssEntry[Bssidx].WepStatus));
                                DBGPRINT(RT_DEBUG_TRACE, ("bssid=%s\n", pAd->ScanTab.BssEntry[Bssidx].Bssid));
-#endif
                                return;
                        }
 

diff --git a/drivers/staging/rt2870/common/2870_rtmp_init.c b/drivers/staging/rt2870/common/2870_rtmp_init.c
index a20550e4cf138ede1558b7811e87f380515cd16e..40972318b61e9f8fc42f54b445d743350dbfd310 100644 (file)
--- a/drivers/staging/rt2870/common/2870_rtmp_init.c
+++ b/drivers/staging/rt2870/common/2870_rtmp_init.c
@@ -1263,9 +1263,7 @@ static void rt2870_hcca_dma_done_tasklet(unsigned long data)
        UCHAR                           BulkOutPipeId = 4;
        purbb_t                         pUrb;
 
-#ifndef RT30xx
        DBGPRINT_RAW(RT_DEBUG_ERROR, ("--->hcca_dma_done_tasklet\n"));
-#endif
 
        pUrb                    = (purbb_t)data;
        pHTTXContext    = (PHT_TX_CONTEXT)pUrb->context;
@@ -1305,10 +1303,7 @@ static void rt2870_hcca_dma_done_tasklet(unsigned long data)
                }
        }
 
-#ifndef RT30xx
        DBGPRINT_RAW(RT_DEBUG_ERROR, ("<---hcca_dma_done_tasklet\n"));
-#endif
-               return;
 }