From c8a429a465f9aaabe7fc7ddf5f34ff6dd188a68f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Jul 2009 15:40:57 -0700 Subject: Staging: hv: remove timer wrapper functions Use a real timer (there's only one in the code), no wrapper is needed, it just increases the complexity for no reason. Cc: Bill Pemberton Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/osd.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'drivers/staging/hv/osd.c') diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index c2d3094502e..d39e7a0825a 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -88,48 +87,6 @@ void osd_PageFree(void* page, unsigned int count) __free_page(p);*/ } -static void TimerCallback(unsigned long data) -{ - struct osd_timer *t = (struct osd_timer *) data; - - t->callback(t->context); -} - -struct osd_timer *osd_TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context) -{ - struct osd_timer *t = kmalloc(sizeof(struct osd_timer), GFP_KERNEL); - if (!t) - { - return NULL; - } - - t->callback = pfnTimerCB; - t->context = context; - - init_timer(&t->timer); - t->timer.data = (unsigned long)t; - t->timer.function = TimerCallback; - - return t; -} - -void osd_TimerStart(struct osd_timer *t, u32 expirationInUs) -{ - t->timer.expires = jiffies + usecs_to_jiffies(expirationInUs); - add_timer(&t->timer); -} - -int osd_TimerStop(struct osd_timer *t) -{ - return del_timer(&t->timer); -} - -void osd_TimerClose(struct osd_timer *t) -{ - del_timer(&t->timer); - kfree(t); -} - struct osd_waitevent *osd_WaitEventCreate(void) { struct osd_waitevent *wait = kmalloc(sizeof(struct osd_waitevent), GFP_KERNEL); -- cgit v1.2.3