K. Y. Srinivasan
2011-Mar-10 22:07 UTC
[PATCH 08/21] Staging: hv: Change the signature for vmbus_child_device_register()
In preparation for getting rid of the vmbus_child_dev_add() function,
modify the signature of vmbus_child_device_register(). Note that
the root device is a global variable.
Signed-off-by: K. Y. Srinivasan <kys at microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz at microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling at microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane at microsoft.com>
Signed-off-by: Hank Janssen <hjanssen at microsoft.com>
---
drivers/staging/hv/vmbus_drv.c | 7 +++----
drivers/staging/hv/vmbus_private.h | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index e078c59..0b91eda 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -144,7 +144,7 @@ static struct hv_device *vmbus_device; /* vmbus root device
*/
*/
int vmbus_child_dev_add(struct hv_device *child_dev)
{
- return vmbus_child_device_register(vmbus_device, child_dev);
+ return vmbus_child_device_register(child_dev);
}
/*
@@ -664,8 +664,7 @@ struct hv_device *vmbus_child_device_create(struct hv_guid
*type,
/*
* vmbus_child_device_register - Register the child device on the specified bus
*/
-int vmbus_child_device_register(struct hv_device *root_device_obj,
- struct hv_device *child_device_obj)
+int vmbus_child_device_register(struct hv_device *child_device_obj)
{
int ret = 0;
@@ -680,7 +679,7 @@ int vmbus_child_device_register(struct hv_device
*root_device_obj,
/* The new device belongs to this bus */
child_device_obj->device.bus = &vmbus_drv.bus; /* device->dev.bus;
*/
- child_device_obj->device.parent = &root_device_obj->device;
+ child_device_obj->device.parent = &vmbus_device->device;
child_device_obj->device.release = vmbus_device_release;
/*
diff --git a/drivers/staging/hv/vmbus_private.h
b/drivers/staging/hv/vmbus_private.h
index 1b88b6f..c176773 100644
--- a/drivers/staging/hv/vmbus_private.h
+++ b/drivers/staging/hv/vmbus_private.h
@@ -108,8 +108,7 @@ struct hv_device *vmbus_child_device_create(struct hv_guid
*type,
struct vmbus_channel *channel);
int vmbus_child_dev_add(struct hv_device *device);
-int vmbus_child_device_register(struct hv_device *root_device_obj,
- struct hv_device *child_device_obj);
+int vmbus_child_device_register(struct hv_device *child_device_obj);
void vmbus_child_device_unregister(struct hv_device *device_obj);
/* static void */
--
1.5.5.6