From: Pekka Enberg <penberg@cs.helsinki.fi>
This patch removes the OS_TIMER and related wrappers from driver code. The

patch also changes the code to use msecs_to_jiffies() for setting up

timer->expires.
Cc: Pavel Machek <pavel@suse.cz>

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

---

 drivers/staging/winbond/bssdscpt.h     |    2 +-

 drivers/staging/winbond/linux/common.h |   19 -

 drivers/staging/winbond/mds_f.h        |    6 -

 drivers/staging/winbond/mds_s.h        |    3 +-

 drivers/staging/winbond/rxisr.c        |   29 +-

 drivers/staging/winbond/scan_s.h       |    3 +-

 drivers/staging/winbond/sme_s.h        |    3 +-

 drivers/staging/winbond/wbhal.c        |  586 ++++++++++++++++----------------

 drivers/staging/winbond/wbhal_f.h      |    2 -

 drivers/staging/winbond/wbhal_s.h      |    2 +-

 10 files changed, 312 insertions(+), 343 deletions(-)
diff --git a/drivers/staging/winbond/bssdscpt.h b/drivers/staging/winbond/bssdscpt.h

index 6f557cb..90b5682 100644

--- a/drivers/staging/winbond/bssdscpt.h

+++ b/drivers/staging/winbond/bssdscpt.h

@@ -79,7 +79,7 @@ typedef struct BSSDescriptionElement

 	u16		wIndex;			// THIS BSS element entry index
 	void*	psadapter;		// pointer to THIS adapter

-	OS_TIMER	nTimer;  // MLME timer

+	struct timer_list timer;  // MLME timer
     // Authentication

     u16		wAuthAlgo;      // peer MAC MLME use Auth algorithm, default OPEN_AUTH

diff --git a/drivers/staging/winbond/linux/common.h b/drivers/staging/winbond/linux/common.h

index 42c23a8..521b68a 100644

--- a/drivers/staging/winbond/linux/common.h

+++ b/drivers/staging/winbond/linux/common.h

@@ -84,24 +84,5 @@

 #define OS_MEMORY_CLEAR( _A, _S )	memset( (u8 *)_A,0,_S)

 #define OS_MEMORY_COMPARE( _A, _B, _S )	(memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different
-#define OS_TIMER	struct timer_list

-#define OS_TIMER_INITIAL( _T, _F, _P )			\

-{							\

-	init_timer( _T );				\

-	(_T)->function = (void *)_F##_...
[ message continues ]

It also moves LED handling function.
--

(english) http://www.livejournal.com/~pavelmachek

(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

--

Oh right. That's because I made all the timer functions static and

wanted to avoid a forward declaration.
			Pekka

--