Skip to content

Commit

Permalink
Staging: hv: Change the signature for vmbus_child_device_register()
Browse files Browse the repository at this point in the history
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@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent ece0e32 commit 3ca07cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
7 changes: 3 additions & 4 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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;

Expand All @@ -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;

/*
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/hv/vmbus_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 3ca07cb

Please sign in to comment.