Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02bb4b9e authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: vmbus_drv: Get rid of util synchronixation based on channel counting 



Now that we have dealt with this issue differently, get rid of the
old mechanism.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b9d8e352

drivers/staging/hv/channel_mgmt.c

+0 −17
Original line number Diff line number Diff line
@@ -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();

			}

		}

	}

drivers/staging/hv/hyperv.h

+0 −2
Original line number Diff line number Diff line
@@ -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

 */

drivers/staging/hv/vmbus_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -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;