Skip to content

Commit

Permalink
Staging: hv: vmbus: Get rid of the poll timer in the channel state
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 0a62040 commit ac4accb
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion drivers/staging/hv/channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) +
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/hv/channel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/hyperv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ac4accb

Please sign in to comment.