Staging: rtxxx0: remove dead DBG_DIAGNOSE code

[linux-2.6-microblaze.git] / drivers / staging / rt2860 / common / cmm_data.c

diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index 66eca20..8665cb1 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -1013,11 +1013,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
        }
 
        return TRUE;
-
-#ifdef RT30xx
-FillTxBlkErr:
-       return FALSE;
-#endif
 }
 
 
@@ -1096,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)
@@ -1119,9 +1110,6 @@ VOID RTMPDeQueuePacket(
 
                RT28XX_START_DEQUEUE(pAd, QueIdx, IrqFlags);
 
-#ifdef DBG_DIAGNOSE
-               firstRound = ((QueIdx == 0) ? TRUE : FALSE);
-#endif // DBG_DIAGNOSE //
 
                while (1)
                {
@@ -1141,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)
                        {
@@ -1533,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;
@@ -1598,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;
 
@@ -2621,7 +2576,9 @@ BOOLEAN MacTableDeleteEntry(
                AsicUpdateProtect(pAd, 0 /*pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode*/, (ALLN_SETPROTECT), TRUE, 0 /*pAd->MacTab.fAnyStationNonGF*/);
 #endif
 #ifdef RT30xx
-               RT28XX_UPDATE_PROTECT(pAd);  // edit by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet
+               // edit by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet
+               // Set MAC register value according operation mode
+               RTUSBEnqueueInternalCmd(pAd, CMDTHREAD_UPDATE_PROTECT, NULL, 0);
 #endif
        }