From f22de61919351066b3eaf255cce00f6f9931bc2d Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 8 Sep 2011 07:24:14 -0700
Subject: [PATCH] --- yaml --- r: 268319 b: refs/heads/master c:
 696453ba2830501274b17a5953c40f7794a56df0 h: refs/heads/master i:   268317:
 d0982002f9c9c3a01c9b240a6b28e9f3e5d0b52b   268315:
 921fd9f240949d3fe959a62b7d986bbbdfd05106   268311:
 c79fc23ebfcb7c0571cba32b299fc1872b0ccf52   268303:
 9c0b19ec6749e9d7424076b1b6e2f8680ee83889   268287:
 f967bdadb31a49a7d9775f0d2e4fd79256ecf9a5 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/hv/channel_mgmt.c | 2 +-
 trunk/drivers/staging/hv/hyperv_vmbus.h | 2 +-
 trunk/drivers/staging/hv/vmbus_drv.c    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a88148c46e0d..62b165503d3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22794281974f9ba7770615191c382cca03067736
+refs/heads/master: 696453ba2830501274b17a5953c40f7794a56df0
diff --git a/trunk/drivers/staging/hv/channel_mgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
index a9270467bb99..60ce1d1492fe 100644
--- a/trunk/drivers/staging/hv/channel_mgmt.c
+++ b/trunk/drivers/staging/hv/channel_mgmt.c
@@ -333,7 +333,7 @@ static void vmbus_process_rescind_offer(struct work_struct *work)
 						     struct vmbus_channel,
 						     work);
 
-	vmbus_child_device_unregister(channel->device_obj);
+	vmbus_device_unregister(channel->device_obj);
 }
 
 /*
diff --git a/trunk/drivers/staging/hv/hyperv_vmbus.h b/trunk/drivers/staging/hv/hyperv_vmbus.h
index b2dfcd650f18..3d2d836c3cc8 100644
--- a/trunk/drivers/staging/hv/hyperv_vmbus.h
+++ b/trunk/drivers/staging/hv/hyperv_vmbus.h
@@ -606,7 +606,7 @@ struct hv_device *vmbus_device_create(uuid_le *type,
 					 struct vmbus_channel *channel);
 
 int vmbus_device_register(struct hv_device *child_device_obj);
-void vmbus_child_device_unregister(struct hv_device *device_obj);
+void vmbus_device_unregister(struct hv_device *device_obj);
 
 /* static void */
 /* VmbusChildDeviceDestroy( */
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 6d54ea1fbc3b..375e45184d2b 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -650,10 +650,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
 }
 
 /*
- * vmbus_child_device_unregister - Remove the specified child device
+ * vmbus_device_unregister - Remove the specified child device
  * from the vmbus.
  */
-void vmbus_child_device_unregister(struct hv_device *device_obj)
+void vmbus_device_unregister(struct hv_device *device_obj)
 {
 	/*
 	 * Kick off the process of unregistering the device.