From a1a39cb76461a6521435b3bdf047684a93c29226 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 10 Mar 2011 14:07:44 -0800
Subject: [PATCH] --- yaml --- r: 236543 b: refs/heads/master c:
 e13a0b5a4b2ca9e318896a1c8c4b45d62477c956 h: refs/heads/master i:   236541:
 f2c10835b5e9b02c2d69dee4a958651d9ba19fa8   236539:
 d49ce7b2cc32aee7b6f7487c3e01594a14647d15   236535:
 233cc7c89551f858be8957bf8c1b22b0074151a4   236527:
 41f29520649d193951836684860b74a018dd7fe9   236511:
 7dd89c809f59adc8c3410c6b9dde2e576623ed18   236479:
 ff2676c2c08c85b0e56dd4f058dbeb3f3258aeb2   236415:
 01f6e427548e75bec531962bbf0fb77049224e60   236287:
 f19aec51815d9ccf3aca4721ffea2117fe8f7d59   236031:
 632ccd8963316f0804d6bbbb966ea15de34ae580   235519:
 eacc39709b9d7d7c441553dea179a2b5b9ee7adc v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/hv/channel_mgmt.c  | 2 +-
 trunk/drivers/staging/hv/vmbus_drv.c     | 9 +--------
 trunk/drivers/staging/hv/vmbus_private.h | 1 -
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 4b80dd4fa4dc..242ab31db233 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ca07cb06d3176b3eb1bfd49fdc8c8fbe649fa5b
+refs/heads/master: e13a0b5a4b2ca9e318896a1c8c4b45d62477c956
diff --git a/trunk/drivers/staging/hv/channel_mgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
index 0781c0ed7056..33688094e1fd 100644
--- a/trunk/drivers/staging/hv/channel_mgmt.c
+++ b/trunk/drivers/staging/hv/channel_mgmt.c
@@ -408,7 +408,7 @@ static void vmbus_process_offer(struct work_struct *work)
 	 * binding which eventually invokes the device driver's AddDevice()
 	 * method.
 	 */
-	ret = vmbus_child_dev_add(newchannel->device_obj);
+	ret = vmbus_child_device_register(newchannel->device_obj);
 	if (ret != 0) {
 		DPRINT_ERR(VMBUS,
 			   "unable to add child device object (relid %d)",
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 0b91edad6e11..b473f468dd83 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -139,13 +139,6 @@ static const struct hv_guid device_id = {
 
 static struct hv_device *vmbus_device; /* vmbus root device */
 
-/*
- * vmbus_child_dev_add - Registers the child device with the vmbus
- */
-int vmbus_child_dev_add(struct hv_device *child_dev)
-{
-	return vmbus_child_device_register(child_dev);
-}
 
 /*
  * vmbus_dev_add - Callback when the root bus device is added
@@ -662,7 +655,7 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *type,
 }
 
 /*
- * vmbus_child_device_register - Register the child device on the specified bus
+ * vmbus_child_device_register - Register the child device
  */
 int vmbus_child_device_register(struct hv_device *child_device_obj)
 {
diff --git a/trunk/drivers/staging/hv/vmbus_private.h b/trunk/drivers/staging/hv/vmbus_private.h
index c176773440d2..ca050a499b99 100644
--- a/trunk/drivers/staging/hv/vmbus_private.h
+++ b/trunk/drivers/staging/hv/vmbus_private.h
@@ -107,7 +107,6 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *type,
 					 struct hv_guid *instance,
 					 struct vmbus_channel *channel);
 
-int vmbus_child_dev_add(struct hv_device *device);
 int vmbus_child_device_register(struct hv_device *child_device_obj);
 void vmbus_child_device_unregister(struct hv_device *device_obj);