diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2011-06-06 22:49:50 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 20:45:54 (GMT) |
commit | ac4accb2bd619380c2404f9064e91f48674c6eb8 (patch) | |
tree | b09502c339700f14016f5c4f1c3939c18f3d5db8 /drivers | |
parent | 0a62040eac5ec13e5ffca82e4d9a7dca888fa236 (diff) | |
download | linux-ac4accb2bd619380c2404f9064e91f48674c6eb8.tar.xz |
Staging: hv: vmbus: Get rid of the poll timer in the channel state
Since tis is not used anymore, get rid of the poll timer in the channel state.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/hv/channel.c | 1 | ||||
-rw-r--r-- | drivers/staging/hv/channel_mgmt.c | 5 | ||||
-rw-r--r-- | drivers/staging/hv/hyperv.h | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index b6f8674..b91b369 100644 --- a/drivers/staging/hv/channel.c +++ b/drivers/staging/hv/channel.c @@ -555,7 +555,6 @@ void vmbus_close(struct vmbus_channel *channel) /* Stop callback and cancel the timer asap */ channel->onchannel_callback = NULL; - del_timer_sync(&channel->poll_timer); /* Send a closing message */ info = kmalloc(sizeof(*info) + diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index 957d61e..178e1c4 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/drivers/staging/hv/channel_mgmt.c @@ -283,10 +283,6 @@ static struct vmbus_channel *alloc_channel(void) spin_lock_init(&channel->inbound_lock); - init_timer(&channel->poll_timer); - channel->poll_timer.data = (unsigned long)channel; - channel->poll_timer.function = vmbus_ontimer; - channel->controlwq = create_workqueue("hv_vmbus_ctl"); if (!channel->controlwq) { kfree(channel); @@ -315,7 +311,6 @@ static void release_channel(struct work_struct *work) */ void free_channel(struct vmbus_channel *channel) { - del_timer_sync(&channel->poll_timer); /* * We have to release the channel's workqueue/thread in the vmbus's diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h index e881cfe..73c251e 100644 --- a/drivers/staging/hv/hyperv.h +++ b/drivers/staging/hv/hyperv.h @@ -528,7 +528,6 @@ struct vmbus_channel { struct hv_device *device_obj; - struct timer_list poll_timer; /* SA-111 workaround */ struct work_struct work; enum vmbus_channel_state state; |