Staging: w35und: remove rxisr.c as dead code

The vRxTimerStart() function is never called nor does the timer do anything
useful so remove the code.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index d337571a972b238b0d25fc0bfa0ad0eb85069c2c..b49c9730eddf9431fa38771d93ffb9c5634b4ba9 100644 (file)
--- a/drivers/staging/winbond/Makefile
+++ b/drivers/staging/winbond/Makefile
@@ -4,7 +4,6 @@ w35und-objs :=                  \
        mto.o                   \
        phy_calibration.o       \
        reg.o                   \
-       rxisr.o                 \
        wb35reg.o               \
        wb35rx.o                \
        wb35tx.o                \

diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index 1bfdbc4827ffa249bad2db24ff4cca77db171056..e431406e25a6f1fce31060e5096d2f50c92facce 100644 (file)
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -16,15 +16,12 @@ Mds_initial(struct wbsoft_priv * adapter)
        pMds->TxRTSThreshold = DEFAULT_RTSThreshold;
        pMds->TxFragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD;
 
-       vRxTimerInit(adapter);//for WPA countermeasure
-
        return hal_get_tx_buffer( &adapter->sHwData, &pMds->pTxBuffer );
 }
 
 void
 Mds_Destroy(struct wbsoft_priv * adapter)
 {
-       vRxTimerStop(adapter);
 }
 
 static void Mds_DurationSet(struct wbsoft_priv *adapter,  PDESCRIPTOR pDes,  u8 *buffer)

diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h
index 8109eba09addb2d4ee24ab2a6b2ced4a2285fc32..ee0f12093dba34737be3f10283689bdbb7ad81aa 100644 (file)
--- a/drivers/staging/winbond/mds_f.h
+++ b/drivers/staging/winbond/mds_f.h
@@ -11,11 +11,6 @@ void Mds_SendComplete(  struct wbsoft_priv *adapter,  PT02_DESCRIPTOR pT02 );
 void Mds_MpduProcess(  struct wbsoft_priv *adapter,  PDESCRIPTOR pRxDes );
 extern void DataDmp(u8 *pdata, u32 len, u32 offset);
 
-
-void vRxTimerInit(struct wbsoft_priv *adapter);
-void vRxTimerStart(struct wbsoft_priv *adapter, int timeout_value);
-void vRxTimerStop(struct wbsoft_priv *adapter);
-
 // For Asynchronous indicating. The routine collocates with USB.
 void Mds_MsduProcess(  struct wbsoft_priv *adapter,  PRXLAYER1 pRxLayer1,  u8 SlotIndex);
 

diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
index 29f15689dcc0bb503345f9d42433b084236caeb7..ebf61e3ce1dcf74e87dbd10e652291bd454204b6 100644 (file)
--- a/drivers/staging/winbond/mds_s.h
+++ b/drivers/staging/winbond/mds_s.h
@@ -142,8 +142,6 @@ typedef struct _MDS
        u8              boCounterMeasureBlock;
        u8              reserved_4[2];
 
-       struct timer_list timer;
-
        u32     TxTsc; // 20060214
        u32     TxTsc_2; // 20060214
 

diff --git a/drivers/staging/winbond/rxisr.c b/drivers/staging/winbond/rxisr.c
deleted file mode 100644 (file)
index d591003..0000000
--- a/drivers/staging/winbond/rxisr.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "os_common.h"
-#include "core.h"
-
-static void RxTimerHandler(unsigned long data)
-{
-       WARN_ON(1);
-}
-
-void vRxTimerInit(struct wbsoft_priv *adapter)
-{
-       init_timer(&adapter->Mds.timer);
-       adapter->Mds.timer.function = RxTimerHandler;
-       adapter->Mds.timer.data = (unsigned long) adapter;
-}
-
-void vRxTimerStart(struct wbsoft_priv *adapter, int timeout_value)
-{
-       if (timeout_value < MIN_TIMEOUT_VAL)
-               timeout_value = MIN_TIMEOUT_VAL;
-
-       adapter->Mds.timer.expires = jiffies + msecs_to_jiffies(timeout_value);
-       add_timer(&adapter->Mds.timer);
-}
-
-void vRxTimerStop(struct wbsoft_priv *adapter)
-{
-       del_timer_sync(&adapter->Mds.timer);
-}

diff --git a/drivers/staging/winbond/sysdef.h b/drivers/staging/winbond/sysdef.h
index 60e4c04f725baef2f91d28bd501668d6dd5cc7b8..251b9c553b6c40ba8e44e6c7a9d0395f534aad5b 100644 (file)
--- a/drivers/staging/winbond/sysdef.h
+++ b/drivers/staging/winbond/sysdef.h
@@ -37,7 +37,4 @@
 #define _PE_USB_INI_DUMP_
 #endif
 
-// Kernel Timer resolution, NDIS is 10ms, 10000us
-#define MIN_TIMEOUT_VAL        (10) //ms
-
 #endif