LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Pekka Enberg <penberg@cs.helsinki.fi>
To: greg@kroah.com
Cc: linux-kernel@vger.kernel.org,
	Pekka Enberg <penberg@cs.helsinki.fi>,
	Pavel Machek <pavel@suse.cz>
Subject: [PATCH 7/7] w35und: remove rxisr.c as dead code
Date: Thu, 30 Oct 2008 19:04:56 +0200	[thread overview]
Message-ID: <1225386296-19632-7-git-send-email-penberg@cs.helsinki.fi> (raw)
In-Reply-To: <1225386296-19632-6-git-send-email-penberg@cs.helsinki.fi>

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

Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 drivers/staging/winbond/Makefile |    1 -
 drivers/staging/winbond/mds.c    |    3 ---
 drivers/staging/winbond/mds_f.h  |    5 -----
 drivers/staging/winbond/mds_s.h  |    2 --
 drivers/staging/winbond/rxisr.c  |   28 ----------------------------
 drivers/staging/winbond/sysdef.h |    3 ---
 6 files changed, 0 insertions(+), 42 deletions(-)
 delete mode 100644 drivers/staging/winbond/rxisr.c

diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index d337571..b49c973 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 0dd1eec..8b638d7 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 8109eba..ee0f120 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 29f1568..ebf61e3 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 f4619d9..0000000
--- a/drivers/staging/winbond/rxisr.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "sysdef.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 60e4c04..251b9c5 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
-- 
1.5.3.7


  reply	other threads:[~2008-10-30 17:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-30 17:04 [PATCH 1/7] w35und: make functions local to mds.c static Pekka Enberg
2008-10-30 17:04 ` [PATCH 2/7] w35und: make functions local to mlmetxrx.c static Pekka Enberg
2008-10-30 17:04   ` [PATCH 3/7] w35und: remove dead code from mto.c Pekka Enberg
2008-10-30 17:04     ` [PATCH 4/7] w35und: make functions local to wb35rx.c static Pekka Enberg
2008-10-30 17:04       ` [PATCH 5/7] w35und: make functions local to wb35tx.c static Pekka Enberg
2008-10-30 17:04         ` [PATCH 6/7] w35und: remove dead code from wbhal.c Pekka Enberg
2008-10-30 17:04           ` Pekka Enberg [this message]
2008-10-30 19:29             ` [PATCH 7/7] w35und: remove rxisr.c as dead code Pavel Machek
2008-11-12 21:58               ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1225386296-19632-7-git-send-email-penberg@cs.helsinki.fi \
    --to=penberg@cs.helsinki.fi \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel@suse.cz \
    --subject='Re: [PATCH 7/7] w35und: remove rxisr.c as dead code' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).