aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-10-30 19:04:56 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:51:52 -0800
commita3f245a2df2e9eeb5fcf78c8e12ac6363e847a13 (patch)
treec83dde71a9c812aafb499ca85051208574d4d342
parent82321c2b56d4df95c9a41d6b032aeb769c8f210e (diff)
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>
-rw-r--r--drivers/staging/winbond/Makefile1
-rw-r--r--drivers/staging/winbond/mds.c3
-rw-r--r--drivers/staging/winbond/mds_f.h5
-rw-r--r--drivers/staging/winbond/mds_s.h2
-rw-r--r--drivers/staging/winbond/rxisr.c28
-rw-r--r--drivers/staging/winbond/sysdef.h3
6 files changed, 0 insertions, 42 deletions
diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index d337571a972..b49c9730edd 100644
--- 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 1bfdbc4827f..e431406e25a 100644
--- 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 8109eba09ad..ee0f12093db 100644
--- 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 29f15689dcc..ebf61e3ce1d 100644
--- 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
index d591003a38e..00000000000
--- 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 60e4c04f725..251b9c553b6 100644
--- 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