From 06d2e318b749689d659b3f0c90a157f1ebb31f15 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Tue, 28 Jul 2009 13:46:25 -0400 Subject: Staging: hv remove TIMER typedef Remove the TIMER typedef and also replace HANDLE types that use the timer calls. Signed-off-by: Bill Pemberton Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/osd.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'drivers/staging/hv/osd.c') diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index 50a2ca7dde2e..35c9ac2f3158 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -49,11 +49,6 @@ /* Data types */ -typedef struct _TIMER { - struct timer_list timer; - PFN_TIMER_CALLBACK callback; - void* context; -}TIMER; typedef struct _WORKITEM { struct work_struct work; @@ -168,14 +163,14 @@ void MemUnmapIO(void *virt) void TimerCallback(unsigned long data) { - TIMER* t = (TIMER*)data; + struct osd_timer *t = (struct osd_timer *) data; t->callback(t->context); } -HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context) +struct osd_timer *TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context) { - TIMER* t = kmalloc(sizeof(TIMER), GFP_KERNEL); + struct osd_timer *t = kmalloc(sizeof(struct osd_timer), GFP_KERNEL); if (!t) { return NULL; @@ -191,25 +186,19 @@ HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context) return t; } -void TimerStart(HANDLE hTimer, u32 expirationInUs) +void TimerStart(struct osd_timer *t, u32 expirationInUs) { - TIMER* t = (TIMER* )hTimer; - t->timer.expires = jiffies + usecs_to_jiffies(expirationInUs); add_timer(&t->timer); } -int TimerStop(HANDLE hTimer) +int TimerStop(struct osd_timer *t) { - TIMER* t = (TIMER* )hTimer; - return del_timer(&t->timer); } -void TimerClose(HANDLE hTimer) +void TimerClose(struct osd_timer *t) { - TIMER* t = (TIMER* )hTimer; - del_timer(&t->timer); kfree(t); } -- cgit v1.2.3-55-g7522