diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-29 15:40:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:54 -0700 |
| commit | c8a429a465f9aaabe7fc7ddf5f34ff6dd188a68f (patch) | |
| tree | 59f0837b4888425fc61063931bcf77af0f05252c /drivers/staging/hv/ChannelMgmt.c | |
| parent | bfc30aae73b6be57528059a9e03ce8674320e67b (diff) | |
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 <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/ChannelMgmt.c')
| -rw-r--r-- | drivers/staging/hv/ChannelMgmt.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index 96b88647cd1c..8c83721fea57 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c @@ -141,18 +141,14 @@ static VMBUS_CHANNEL* AllocVmbusChannel(void) spin_lock_init(&channel->inbound_lock); - channel->PollTimer = osd_TimerCreate(VmbusChannelOnTimer, channel); - if (!channel->PollTimer) - { - kfree(channel); - return NULL; - } + init_timer(&channel->poll_timer); + channel->poll_timer.data = (unsigned long)channel; + channel->poll_timer.function = VmbusChannelOnTimer; /* channel->dataWorkQueue = WorkQueueCreate("data"); */ channel->ControlWQ = create_workqueue("hv_vmbus_ctl"); if (!channel->ControlWQ) { - osd_TimerClose(channel->PollTimer); kfree(channel); return NULL; } @@ -195,7 +191,7 @@ Description: --*/ static void FreeVmbusChannel(VMBUS_CHANNEL* Channel) { - osd_TimerClose(Channel->PollTimer); + del_timer(&Channel->poll_timer); /* We have to release the channel's workqueue/thread in the vmbus's workqueue/thread context */ /* ie we can't destroy ourselves. */ |