Staging: hv: remove OnChildDeviceRemove vmbus_driver callback
It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
9205307cd8
commit
9d8bd71ad4
|
@ -413,7 +413,7 @@ static void vmbus_process_rescind_offer(void *context)
|
||||||
{
|
{
|
||||||
struct vmbus_channel *channel = context;
|
struct vmbus_channel *channel = context;
|
||||||
|
|
||||||
VmbusChildDeviceRemove(channel->device_obj);
|
vmbus_child_device_unregister(channel->device_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -847,7 +847,7 @@ void vmbus_release_unattached_channels(void)
|
||||||
"Releasing unattached device object %p",
|
"Releasing unattached device object %p",
|
||||||
channel->device_obj);
|
channel->device_obj);
|
||||||
|
|
||||||
VmbusChildDeviceRemove(channel->device_obj);
|
vmbus_child_device_unregister(channel->device_obj);
|
||||||
free_channel(channel);
|
free_channel(channel);
|
||||||
} else {
|
} else {
|
||||||
if (!start)
|
if (!start)
|
||||||
|
|
|
@ -70,16 +70,6 @@ int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
|
||||||
return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
|
return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* VmbusChildDeviceRemove Unregisters the child device from the vmbus
|
|
||||||
*/
|
|
||||||
void VmbusChildDeviceRemove(struct hv_device *ChildDevice)
|
|
||||||
{
|
|
||||||
struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver;
|
|
||||||
|
|
||||||
vmbusDriver->OnChildDeviceRemove(ChildDevice);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* VmbusOnDeviceAdd - Callback when the root bus device is added
|
* VmbusOnDeviceAdd - Callback when the root bus device is added
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -124,7 +124,6 @@ struct vmbus_driver {
|
||||||
/* Set by the caller */
|
/* Set by the caller */
|
||||||
int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
|
int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
|
||||||
struct hv_device *ChildDevice);
|
struct hv_device *ChildDevice);
|
||||||
void (*OnChildDeviceRemove)(struct hv_device *device);
|
|
||||||
|
|
||||||
/* Set by the callee */
|
/* Set by the callee */
|
||||||
int (*OnIsr)(struct hv_driver *driver);
|
int (*OnIsr)(struct hv_driver *driver);
|
||||||
|
|
|
@ -71,7 +71,6 @@ static void vmbus_bus_release(struct device *device);
|
||||||
|
|
||||||
static int vmbus_child_device_register(struct hv_device *root_device_obj,
|
static int vmbus_child_device_register(struct hv_device *root_device_obj,
|
||||||
struct hv_device *child_device_obj);
|
struct hv_device *child_device_obj);
|
||||||
static void vmbus_child_device_unregister(struct hv_device *child_device_obj);
|
|
||||||
static ssize_t vmbus_show_device_attr(struct device *dev,
|
static ssize_t vmbus_show_device_attr(struct device *dev,
|
||||||
struct device_attribute *dev_attr,
|
struct device_attribute *dev_attr,
|
||||||
char *buf);
|
char *buf);
|
||||||
|
@ -298,7 +297,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
|
||||||
* devices on the bus
|
* devices on the bus
|
||||||
*/
|
*/
|
||||||
vmbus_drv_obj->OnChildDeviceAdd = vmbus_child_device_register;
|
vmbus_drv_obj->OnChildDeviceAdd = vmbus_child_device_register;
|
||||||
vmbus_drv_obj->OnChildDeviceRemove = vmbus_child_device_unregister;
|
|
||||||
|
|
||||||
/* Call to bus driver to initialize */
|
/* Call to bus driver to initialize */
|
||||||
ret = drv_init(&vmbus_drv_obj->Base);
|
ret = drv_init(&vmbus_drv_obj->Base);
|
||||||
|
@ -580,7 +578,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
|
||||||
* vmbus_child_device_unregister - Remove the specified child device
|
* vmbus_child_device_unregister - Remove the specified child device
|
||||||
* from the vmbus.
|
* from the vmbus.
|
||||||
*/
|
*/
|
||||||
static void vmbus_child_device_unregister(struct hv_device *device_obj)
|
void vmbus_child_device_unregister(struct hv_device *device_obj)
|
||||||
{
|
{
|
||||||
struct vm_device *device_ctx = to_vm_device(device_obj);
|
struct vm_device *device_ctx = to_vm_device(device_obj);
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *deviceType,
|
||||||
|
|
||||||
int VmbusChildDeviceAdd(struct hv_device *Device);
|
int VmbusChildDeviceAdd(struct hv_device *Device);
|
||||||
|
|
||||||
void VmbusChildDeviceRemove(struct hv_device *Device);
|
void vmbus_child_device_unregister(struct hv_device *device_obj);
|
||||||
|
|
||||||
/* static void */
|
/* static void */
|
||||||
/* VmbusChildDeviceDestroy( */
|
/* VmbusChildDeviceDestroy( */
|
||||||
|
|
Loading…
Reference in New Issue