staging: vt6655: remove mib.c/h dead code.

Remove from makefile and dead variables

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile
index 115b951bf0d954f711f922b3260aba9634995360..d55c3baade5327de0bd3781917cb02cba250a750 100644 (file)
--- a/drivers/staging/vt6655/Makefile
+++ b/drivers/staging/vt6655/Makefile
@@ -11,7 +11,6 @@ vt6655_stage-y +=     device_main.o \
        dpc.o \
        power.o \
        srom.o \
-       mib.o \
        key.o \
        rf.o
 

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 62e07f5259138906b76b087a038d397e2b8f2a79..e9c4bf31a85aba317303440070e64a2a30eedc1b 100644 (file)
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -68,7 +68,6 @@
 
 #include "device_cfg.h"
 #include "card.h"
-#include "mib.h"
 #include "srom.h"
 #include "desc.h"
 #include "key.h"
@@ -286,9 +285,6 @@ struct vnt_private {
        unsigned char abyCurrentNetAddr[ETH_ALEN]; __aligned(2)
        bool bLinkPass;          /* link status: OK or fail */
 
-       /* 802.11 counter */
-       SDot11Counters              s802_11Counter;
-
        unsigned int    uCurrRSSI;
        unsigned char byCurrSQ;
 

diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c
deleted file mode 100644 (file)
index e9d23a7..0000000
--- a/drivers/staging/vt6655/mib.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * File: mib.c
- *
- * Purpose: Implement MIB Data Structure
- *
- * Author: Tevin Chen
- *
- * Date: May 21, 1996
- *
- * Functions:
- *      STAvUpdateIstStatCounter - Update ISR statistic counter
- *      STAvUpdate802_11Counter - Update 802.11 mib counter
- *
- * Revision History:
- *
- */
-
-#include "mac.h"
-#include "mib.h"
-
-/*---------------------  Static Classes  ----------------------------*/
-
-/*---------------------  Static Variables  --------------------------*/
-
-/*---------------------  Static Functions  --------------------------*/
-
-/*---------------------  Export Variables  --------------------------*/
-
-/*---------------------  Export Functions  --------------------------*/
-
-/*
- * Description: Update Isr Statistic Counter
- *
- * Parameters:
- *  In:
- *      pStatistic  - Pointer to Statistic Counter Data Structure
- *      wisr        - Interrupt status
- *  Out:
- *      none
- *
- * Return Value: none
- *
- */
-void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr)
-{
-       /**********************/
-       /* ABNORMAL interrupt */
-       /**********************/
-       /* not any IMR bit invoke irq */
-
-       if (dwIsr == 0) {
-               pStatistic->ISRStat.dwIsrUnknown++;
-               return;
-       }
-
-/* Added by Kyle */
-       if (dwIsr & ISR_TXDMA0)               /* ISR, bit0 */
-               pStatistic->ISRStat.dwIsrTx0OK++;             /* TXDMA0 successful */
-
-       if (dwIsr & ISR_AC0DMA)               /* ISR, bit1 */
-               pStatistic->ISRStat.dwIsrAC0TxOK++;           /* AC0DMA successful */
-
-       if (dwIsr & ISR_BNTX)                 /* ISR, bit2 */
-               pStatistic->ISRStat.dwIsrBeaconTxOK++;        /* BeaconTx successful */
-
-       if (dwIsr & ISR_RXDMA0)               /* ISR, bit3 */
-               pStatistic->ISRStat.dwIsrRx0OK++;             /* Rx0 successful */
-
-       if (dwIsr & ISR_TBTT)                 /* ISR, bit4 */
-               pStatistic->ISRStat.dwIsrTBTTInt++;           /* TBTT successful */
-
-       if (dwIsr & ISR_SOFTTIMER)            /* ISR, bit6 */
-               pStatistic->ISRStat.dwIsrSTIMERInt++;
-
-       if (dwIsr & ISR_WATCHDOG)             /* ISR, bit7 */
-               pStatistic->ISRStat.dwIsrWatchDog++;
-
-       if (dwIsr & ISR_FETALERR)             /* ISR, bit8 */
-               pStatistic->ISRStat.dwIsrUnrecoverableError++;
-
-       if (dwIsr & ISR_SOFTINT)              /* ISR, bit9 */
-               pStatistic->ISRStat.dwIsrSoftInterrupt++;     /* software interrupt */
-
-       if (dwIsr & ISR_MIBNEARFULL)          /* ISR, bit10 */
-               pStatistic->ISRStat.dwIsrMIBNearfull++;
-
-       if (dwIsr & ISR_RXNOBUF)              /* ISR, bit11 */
-               pStatistic->ISRStat.dwIsrRxNoBuf++;           /* Rx No Buff */
-
-       if (dwIsr & ISR_RXDMA1)               /* ISR, bit12 */
-               pStatistic->ISRStat.dwIsrRx1OK++;             /* Rx1 successful */
-
-       if (dwIsr & ISR_SOFTTIMER1)           /* ISR, bit21 */
-               pStatistic->ISRStat.dwIsrSTIMER1Int++;
-}

diff --git a/drivers/staging/vt6655/mib.h b/drivers/staging/vt6655/mib.h
deleted file mode 100644 (file)
index 64ca360..0000000
--- a/drivers/staging/vt6655/mib.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * File: mib.h
- *
- * Purpose: Implement MIB Data Structure
- *
- * Author: Tevin Chen
- *
- * Date: May 21, 1996
- *
- */
-
-#ifndef __MIB_H__
-#define __MIB_H__
-
-#include "desc.h"
-
-//
-// 802.11 counter
-//
-
-typedef struct tagSDot11Counters {
-       unsigned long long   RTSSuccessCount;
-       unsigned long long   RTSFailureCount;
-       unsigned long long   ACKFailureCount;
-       unsigned long long   FCSErrorCount;
-} SDot11Counters, *PSDot11Counters;
-
-//
-// Custom counter
-//
-typedef struct tagSISRCounters {
-       unsigned long dwIsrTx0OK;
-       unsigned long dwIsrAC0TxOK;
-       unsigned long dwIsrBeaconTxOK;
-       unsigned long dwIsrRx0OK;
-       unsigned long dwIsrTBTTInt;
-       unsigned long dwIsrSTIMERInt;
-       unsigned long dwIsrWatchDog;
-       unsigned long dwIsrUnrecoverableError;
-       unsigned long dwIsrSoftInterrupt;
-       unsigned long dwIsrMIBNearfull;
-       unsigned long dwIsrRxNoBuf;
-
-       unsigned long dwIsrUnknown;
-
-       unsigned long dwIsrRx1OK;
-       unsigned long dwIsrSTIMER1Int;
-} SISRCounters, *PSISRCounters;
-
-//
-// statistic counter
-//
-typedef struct tagSStatCounter {
-       SISRCounters ISRStat;
-} SStatCounter, *PSStatCounter;
-
-void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr);
-
-#endif // __MIB_H__