diff options
| -rw-r--r-- | drivers/staging/hv/channel_mgmt.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 9 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_private.h | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index 0781c0ed7056..33688094e1fd 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/drivers/staging/hv/channel_mgmt.c @@ -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)", diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 0b91edad6e11..b473f468dd83 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -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 @@ -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) { diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h index c176773440d2..ca050a499b99 100644 --- a/drivers/staging/hv/vmbus_private.h +++ b/drivers/staging/hv/vmbus_private.h @@ -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); |