diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-09-08 07:24:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-09 13:45:39 -0700 |
| commit | 696453ba2830501274b17a5953c40f7794a56df0 (patch) | |
| tree | 33297f99273e43d63d865f95ab487684202a2185 | |
| parent | 22794281974f9ba7770615191c382cca03067736 (diff) | |
Staging: hv: vmbus: Rename vmbus_child_device_unregister
The vmbus devices are NOT child devices; rename vmbus_child_device_unregister
to reflect this.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/channel_mgmt.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/hyperv_vmbus.h | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index a9270467bb99..60ce1d1492fe 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/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/drivers/staging/hv/hyperv_vmbus.h b/drivers/staging/hv/hyperv_vmbus.h index b2dfcd650f18..3d2d836c3cc8 100644 --- a/drivers/staging/hv/hyperv_vmbus.h +++ b/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/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 6d54ea1fbc3b..375e45184d2b 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/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. |