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>

diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index b6f86744b12dd98ee17fc3868d4dbf226edae9dc..b91b36912357666b4060ae69d030cc0ee299d371 100644 (file)
--- 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 957d61ee4cebe2f2f9b02edd84c077fe1491b738..178e1c429f5624539c39165db37a00185645a326 100644 (file)
--- 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 e881cfe29fabc14613c9bf5ceba0f004e238fb20..73c251efad4ce624471b23d56012f6e01f3e6b9d 100644 (file)
--- 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;