Now that we have dealt with this issue differently, get rid of the old mechanism.
Signed-off-by: K. Y. Srinivasan <[email protected]> Signed-off-by: Haiyang Zhang <[email protected]> Signed-off-by: Abhishek Kane <[email protected]> Signed-off-by: Hank Janssen <[email protected]> --- drivers/staging/hv/channel_mgmt.c | 17 ----------------- drivers/staging/hv/hyperv.h | 2 -- drivers/staging/hv/vmbus_drv.c | 1 - 3 files changed, 0 insertions(+), 20 deletions(-) diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index b7343bc..957d61e 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/drivers/staging/hv/channel_mgmt.c @@ -327,22 +327,6 @@ void free_channel(struct vmbus_channel *channel) } -DECLARE_COMPLETION(hv_channel_ready); - -/* - * Count initialized channels, and ensure all channels are ready when hv_vmbus - * module loading completes. - */ -static void count_hv_channel(void) -{ - static int counter; - unsigned long flags; - - spin_lock_irqsave(&vmbus_connection.channel_lock, flags); - if (++counter == MAX_MSG_TYPES) - complete(&hv_channel_ready); - spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags); -} /* * vmbus_process_rescind_offer - @@ -449,7 +433,6 @@ static void vmbus_process_offer(struct work_struct *work) pr_info("%s\n", hv_cb_utils[cnt].log_msg); - count_hv_channel(); } } } diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h index 8b826a1..3310e9b 100644 --- a/drivers/staging/hv/hyperv.h +++ b/drivers/staging/hv/hyperv.h @@ -844,8 +844,6 @@ static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d) int vmbus_child_driver_register(struct device_driver *drv); void vmbus_child_driver_unregister(struct device_driver *drv); -extern struct completion hv_channel_ready; - /* * Common header for Hyper-V ICs */ diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index e553fc9..ec1d38c 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -582,7 +582,6 @@ static int vmbus_bus_init(struct pci_dev *pdev) vmbus_request_offers(); - wait_for_completion(&hv_channel_ready); cleanup: return ret; -- 1.7.4.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
