Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ca07cb0 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarMike Sterling <mike.sterling@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ece0e32f

drivers/staging/hv/vmbus_drv.c

+3 −4
Original line number Diff line number Diff line
@@ -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;



	/*

drivers/staging/hv/vmbus_private.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */