Staging: rtxxx0: remove dead DBG_DIAGNOSE code

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

diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index 8d2e7db8b7af3bf8d1d483de9922a48af7935f15..8665cb182477b6e63ad0aab1e378b6e444d985ff 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -1091,10 +1091,6 @@ VOID RTMPDeQueuePacket(
        TX_BLK                  TxBlk;
        TX_BLK                  *pTxBlk;
 
-#ifdef DBG_DIAGNOSE
-       BOOLEAN                 firstRound;
-       RtmpDiagStruct  *pDiagStruct = &pAd->DiagStruct;
-#endif
 
 
        if (QIdx == NUM_OF_TX_RING)
@@ -1114,9 +1110,6 @@ VOID RTMPDeQueuePacket(
 
                RT28XX_START_DEQUEUE(pAd, QueIdx, IrqFlags);
 
-#ifdef DBG_DIAGNOSE
-               firstRound = ((QueIdx == 0) ? TRUE : FALSE);
-#endif // DBG_DIAGNOSE //
 
                while (1)
                {
@@ -1136,31 +1129,12 @@ VOID RTMPDeQueuePacket(
                        DEQUEUE_LOCK(&pAd->irq_lock, bIntContext, IrqFlags);
                        if (&pAd->TxSwQueue[QueIdx] == NULL)
                        {
-#ifdef DBG_DIAGNOSE
-                               if (firstRound == TRUE)
-                                       pDiagStruct->TxSWQueCnt[pDiagStruct->ArrayCurIdx][0]++;
-#endif // DBG_DIAGNOSE //
                                DEQUEUE_UNLOCK(&pAd->irq_lock, bIntContext, IrqFlags);
                                break;
                        }
 #ifdef RT2860
                        FreeNumber[QueIdx] = GET_TXRING_FREENO(pAd, QueIdx);
 
-#ifdef DBG_DIAGNOSE
-                       if (firstRound == TRUE)
-                       {
-                               UCHAR   txDescNumLevel, txSwQNumLevel;
-
-                               txDescNumLevel = (TX_RING_SIZE - FreeNumber[QueIdx]); // Number of occupied hw desc.
-                               txDescNumLevel = ((txDescNumLevel <=15) ? txDescNumLevel : 15);
-                               pDiagStruct->TxDescCnt[pDiagStruct->ArrayCurIdx][txDescNumLevel]++;
-
-                               txSwQNumLevel = ((pAd->TxSwQueue[QueIdx].Number <=7) ? pAd->TxSwQueue[QueIdx].Number : 8);
-                               pDiagStruct->TxSWQueCnt[pDiagStruct->ArrayCurIdx][txSwQNumLevel]++;
-
-                               firstRound = FALSE;
-                       }
-#endif // DBG_DIAGNOSE //
 
                        if (FreeNumber[QueIdx] <= 5)
                        {
@@ -1528,13 +1502,6 @@ VOID RTMPWriteTxWI_Data(
                }
        }
 
-#ifdef DBG_DIAGNOSE
-               if (pTxBlk->QueIdx== 0)
-               {
-                       pAd->DiagStruct.TxDataCnt[pAd->DiagStruct.ArrayCurIdx]++;
-                       pAd->DiagStruct.TxMcsCnt[pAd->DiagStruct.ArrayCurIdx][pTxWI->MCS]++;
-               }
-#endif // DBG_DIAGNOSE //
 
        // for rate adapation
        pTxWI->PacketId = pTxWI->MCS;
@@ -1593,13 +1560,6 @@ VOID RTMPWriteTxWI_Cache(
                }
        }
 
-#ifdef DBG_DIAGNOSE
-       if (pTxBlk->QueIdx== 0)
-       {
-               pAd->DiagStruct.TxDataCnt[pAd->DiagStruct.ArrayCurIdx]++;
-               pAd->DiagStruct.TxMcsCnt[pAd->DiagStruct.ArrayCurIdx][pTxWI->MCS]++;
-       }
-#endif // DBG_DIAGNOSE //
 
        pTxWI->MPDUtotalByteCount = pTxBlk->MpduHeaderLen + pTxBlk->SrcBufLen;
 

diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index 2dc3297c26d1fe07cd3d2303eea7537e38553a52..2a352303823cc5ee08b6fdd986e8539c2d0d656c 100644 (file)
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -3022,73 +3022,6 @@ VOID NICUpdateRawCounters(
                pAd->RalinkCounters.TransmittedAMPDUCount.u.LowPart += (TxAggCnt7.field.AggSize16Count / 16);
        }
 
-#ifdef DBG_DIAGNOSE
-       {
-               RtmpDiagStruct  *pDiag;
-               COUNTER_RALINK  *pRalinkCounters;
-               UCHAR                   ArrayCurIdx, i;
-
-               pDiag = &pAd->DiagStruct;
-               pRalinkCounters = &pAd->RalinkCounters;
-               ArrayCurIdx = pDiag->ArrayCurIdx;
-
-               if (pDiag->inited == 0)
-               {
-                       NdisZeroMemory(pDiag, sizeof(struct _RtmpDiagStrcut_));
-                       pDiag->ArrayStartIdx = pDiag->ArrayCurIdx = 0;
-                       pDiag->inited = 1;
-               }
-               else
-               {
-                       // Tx
-                       pDiag->TxFailCnt[ArrayCurIdx] = TxStaCnt0.field.TxFailCount;
-                       pDiag->TxAggCnt[ArrayCurIdx] = TxAggCnt.field.AggTxCount;
-                       pDiag->TxNonAggCnt[ArrayCurIdx] = TxAggCnt.field.NonAggTxCount;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][0] = TxAggCnt0.field.AggSize1Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][1] = TxAggCnt0.field.AggSize2Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][2] = TxAggCnt1.field.AggSize3Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][3] = TxAggCnt1.field.AggSize4Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][4] = TxAggCnt2.field.AggSize5Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][5] = TxAggCnt2.field.AggSize6Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][6] = TxAggCnt3.field.AggSize7Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][7] = TxAggCnt3.field.AggSize8Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][8] = TxAggCnt4.field.AggSize9Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][9] = TxAggCnt4.field.AggSize10Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][10] = TxAggCnt5.field.AggSize11Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][11] = TxAggCnt5.field.AggSize12Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][12] = TxAggCnt6.field.AggSize13Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][13] = TxAggCnt6.field.AggSize14Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][14] = TxAggCnt7.field.AggSize15Count;
-                       pDiag->TxAMPDUCnt[ArrayCurIdx][15] = TxAggCnt7.field.AggSize16Count;
-
-                       pDiag->RxCrcErrCnt[ArrayCurIdx] = RxStaCnt0.field.CrcErr;
-
-                       INC_RING_INDEX(pDiag->ArrayCurIdx,  DIAGNOSE_TIME);
-                       ArrayCurIdx = pDiag->ArrayCurIdx;
-                       for (i =0; i < 9; i++)
-                       {
-                               pDiag->TxDescCnt[ArrayCurIdx][i]= 0;
-                               pDiag->TxSWQueCnt[ArrayCurIdx][i] =0;
-                               pDiag->TxMcsCnt[ArrayCurIdx][i] = 0;
-                               pDiag->RxMcsCnt[ArrayCurIdx][i] = 0;
-                       }
-                       pDiag->TxDataCnt[ArrayCurIdx] = 0;
-                       pDiag->TxFailCnt[ArrayCurIdx] = 0;
-                       pDiag->RxDataCnt[ArrayCurIdx] = 0;
-                       pDiag->RxCrcErrCnt[ArrayCurIdx]  = 0;
-                       for (i = 9; i < 24; i++) // 3*3
-                       {
-                               pDiag->TxDescCnt[ArrayCurIdx][i] = 0;
-                               pDiag->TxMcsCnt[ArrayCurIdx][i] = 0;
-                               pDiag->RxMcsCnt[ArrayCurIdx][i] = 0;
-}
-
-                       if (pDiag->ArrayCurIdx == pDiag->ArrayStartIdx)
-                               INC_RING_INDEX(pDiag->ArrayStartIdx,  DIAGNOSE_TIME);
-               }
-
-       }
-#endif // DBG_DIAGNOSE //
 
 
 }

diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index 4c17cc5248cfca2e044aa4aba55831598b23c73c..436ed58f52f7ea52ed8bc7c01a399db63ba64057 100644 (file)
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -45,8 +45,6 @@
 
 #include "aironet.h"
 
-//#define DBG_DIAGNOSE         1
-
 #define VIRTUAL_IF_INC(__pAd) ((__pAd)->VirtualIfCnt++)
 #define VIRTUAL_IF_DEC(__pAd) ((__pAd)->VirtualIfCnt--)
 #define VIRTUAL_IF_NUM(__pAd) ((__pAd)->VirtualIfCnt)
@@ -2524,33 +2522,6 @@ typedef struct _INF_USB_CONFIG
 
 }INF_USB_CONFIG;
 
-#ifdef DBG_DIAGNOSE
-#define DIAGNOSE_TIME  10   // 10 sec
-typedef struct _RtmpDiagStrcut_
-{      // Diagnosis Related element
-       unsigned char           inited;
-       unsigned char   qIdx;
-       unsigned char   ArrayStartIdx;
-       unsigned char           ArrayCurIdx;
-       // Tx Related Count
-       USHORT                  TxDataCnt[DIAGNOSE_TIME];
-       USHORT                  TxFailCnt[DIAGNOSE_TIME];
-       USHORT                  TxDescCnt[DIAGNOSE_TIME][24]; // 3*3    // TxDesc queue length in scale of 0~14, >=15
-       USHORT                  TxMcsCnt[DIAGNOSE_TIME][24]; // 3*3
-       USHORT                  TxSWQueCnt[DIAGNOSE_TIME][9];           // TxSwQueue length in scale of 0, 1, 2, 3, 4, 5, 6, 7, >=8
-
-       USHORT                  TxAggCnt[DIAGNOSE_TIME];
-       USHORT                  TxNonAggCnt[DIAGNOSE_TIME];
-       USHORT                  TxAMPDUCnt[DIAGNOSE_TIME][24]; // 3*3 // 10 sec, TxDMA APMDU Aggregation count in range from 0 to 15, in setp of 1.
-       USHORT                  TxRalinkCnt[DIAGNOSE_TIME];                     // TxRalink Aggregation Count in 1 sec scale.
-       USHORT                  TxAMSDUCnt[DIAGNOSE_TIME];                      // TxAMSUD Aggregation Count in 1 sec scale.
-
-       // Rx Related Count
-       USHORT                  RxDataCnt[DIAGNOSE_TIME];                       // Rx Total Data count.
-       USHORT                  RxCrcErrCnt[DIAGNOSE_TIME];
-       USHORT                  RxMcsCnt[DIAGNOSE_TIME][24]; // 3*3
-}RtmpDiagStruct;
-#endif // DBG_DIAGNOSE //
 
 
 //
@@ -2971,9 +2942,6 @@ typedef struct _RTMP_ADAPTER
        UCHAR                                   flg_be_adjust;
        ULONG                                   be_adjust_last_time;
 
-#ifdef DBG_DIAGNOSE
-       RtmpDiagStruct  DiagStruct;
-#endif // DBG_DIAGNOSE //
 
 
        UINT8                                   PM_FlgSuspend;