Skip to content

Commit

Permalink
Staging: hv: Get rid of vmbus_child_dev_add()
Browse files Browse the repository at this point in the history
The function vmbus_child_dev_add() is a wrapper that can be
eliminated; get rid of it.

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 3ca07cb commit e13a0b5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/hv/channel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ static void vmbus_process_offer(struct work_struct *work)
* binding which eventually invokes the device driver's AddDevice()
* method.
*/
ret = vmbus_child_dev_add(newchannel->device_obj);
ret = vmbus_child_device_register(newchannel->device_obj);
if (ret != 0) {
DPRINT_ERR(VMBUS,
"unable to add child device object (relid %d)",
Expand Down
9 changes: 1 addition & 8 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,6 @@ static const struct hv_guid device_id = {

static struct hv_device *vmbus_device; /* vmbus root device */

/*
* vmbus_child_dev_add - Registers the child device with the vmbus
*/
int vmbus_child_dev_add(struct hv_device *child_dev)
{
return vmbus_child_device_register(child_dev);
}

/*
* vmbus_dev_add - Callback when the root bus device is added
Expand Down Expand Up @@ -662,7 +655,7 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *type,
}

/*
* vmbus_child_device_register - Register the child device on the specified bus
* vmbus_child_device_register - Register the child device
*/
int vmbus_child_device_register(struct hv_device *child_device_obj)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/vmbus_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *type,
struct hv_guid *instance,
struct vmbus_channel *channel);

int vmbus_child_dev_add(struct hv_device *device);
int vmbus_child_device_register(struct hv_device *child_device_obj);
void vmbus_child_device_unregister(struct hv_device *device_obj);

Expand Down

0 comments on commit e13a0b5

Please sign in to comment.