Staging: hv: Get rid of vmbus_child_dev_add()
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>
This commit is contained in:
parent
3ca07cb06d
commit
e13a0b5a4b
3 changed files with 2 additions and 10 deletions
|
@ -408,7 +408,7 @@ static void vmbus_process_offer(struct work_struct *work)
|
||||||
* binding which eventually invokes the device driver's AddDevice()
|
* binding which eventually invokes the device driver's AddDevice()
|
||||||
* method.
|
* method.
|
||||||
*/
|
*/
|
||||||
ret = vmbus_child_dev_add(newchannel->device_obj);
|
ret = vmbus_child_device_register(newchannel->device_obj);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
DPRINT_ERR(VMBUS,
|
DPRINT_ERR(VMBUS,
|
||||||
"unable to add child device object (relid %d)",
|
"unable to add child device object (relid %d)",
|
||||||
|
|
|
@ -139,13 +139,6 @@ static const struct hv_guid device_id = {
|
||||||
|
|
||||||
static struct hv_device *vmbus_device; /* vmbus root device */
|
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
|
* 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)
|
int vmbus_child_device_register(struct hv_device *child_device_obj)
|
||||||
{
|
{
|
||||||
|
|
|
@ -107,7 +107,6 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *type,
|
||||||
struct hv_guid *instance,
|
struct hv_guid *instance,
|
||||||
struct vmbus_channel *channel);
|
struct vmbus_channel *channel);
|
||||||
|
|
||||||
int vmbus_child_dev_add(struct hv_device *device);
|
|
||||||
int vmbus_child_device_register(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);
|
void vmbus_child_device_unregister(struct hv_device *device_obj);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue