Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap

[cascardo/linux.git] / drivers / staging / hv / channel_mgmt.c

diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 957d61e..bf011f3 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
@@ -482,7 +477,6 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
        newchannel->monitor_grp = (u8)offer->monitorid / 32;
        newchannel->monitor_bit = (u8)offer->monitorid % 32;
 
-       /* TODO: Make sure the offer comes from our parent partition */
        INIT_WORK(&newchannel->work, vmbus_process_offer);
        queue_work(newchannel->controlwq, &newchannel->work);
 }
@@ -773,7 +767,7 @@ int vmbus_request_offers(void)
                goto cleanup;
        }
 
-       t = wait_for_completion_timeout(&msginfo->waitevent, HZ);
+       t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ);
        if (t == 0) {
                ret = -ETIMEDOUT;
                goto cleanup;