---

yaml --- r: 268319 b: refs/heads/master c: 696453b h: refs/heads/master i: 268317: d098200 268315: 921fd9f 268311: c79fc23 268303: 9c0b19e 268287: f967bda v: v3
git-mirror · Sep 9, 2011 · f22de61 · f22de61
1 parent d78b451
commit f22de61
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.
-Original file line number
+Diff line change
@@ Expand Up @@
     						     struct vmbus_channel,
     						     work);
-    	vmbus_child_device_unregister(channel->device_obj);
+    	vmbus_device_unregister(channel->device_obj);
     }
     /*
@@ Expand Down @@