p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: unisys: visorbus: Get rid of passthrough function visorchipset_device_destroy 

The function visorchipset_device_destroy just called remove_visor_device,
we can just combine it with remove_visor_device.

Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sameer Wadgaonkar 2017-08-22 13:27:35 -04:00 committed by Greg Kroah-Hartman
parent 51c0f81cca
commit b74856b419
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/unisys/visorbus/visorbus_main.c
View File

@ -716,11 +716,12 @@ int create_visor_device(struct visor_device *dev)
return err; return err;
} }
static void remove_visor_device(struct visor_device *dev) void remove_visor_device(struct visor_device *dev)
{ {
list_del(&dev->list_all); list_del(&dev->list_all);
put_device(&dev->device); put_device(&dev->device);
device_unregister(&dev->device); device_unregister(&dev->device);
visorbus_response(dev, 0, CONTROLVM_DEVICE_DESTROY);
} }
static int get_vbus_header_info(struct visorchannel *chan, static int get_vbus_header_info(struct visorchannel *chan,
@ -1119,12 +1120,6 @@ static void remove_all_visor_devices(void)
} }
} }
void visorchipset_device_destroy(struct visor_device *dev_info)
{
remove_visor_device(dev_info);
visorbus_response(dev_info, 0, CONTROLVM_DEVICE_DESTROY);
}
/* /*
* pause_state_change_complete() - the callback function to be called by a * pause_state_change_complete() - the callback function to be called by a
* visorbus function driver when a * visorbus function driver when a

2
drivers/staging/unisys/visorbus/visorbus_private.h
View File

@ -26,7 +26,7 @@
int visorbus_create_instance(struct visor_device *dev); int visorbus_create_instance(struct visor_device *dev);
void visorbus_remove_instance(struct visor_device *bus_info); void visorbus_remove_instance(struct visor_device *bus_info);
int create_visor_device(struct visor_device *dev_info); int create_visor_device(struct visor_device *dev_info);
void visorchipset_device_destroy(struct visor_device *dev_info); void remove_visor_device(struct visor_device *dev_info);
int visorchipset_device_pause(struct visor_device *dev_info); int visorchipset_device_pause(struct visor_device *dev_info);
int visorchipset_device_resume(struct visor_device *dev_info); int visorchipset_device_resume(struct visor_device *dev_info);

2
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -948,7 +948,7 @@ static int visorbus_device_destroy(struct controlvm_message *inmsg)
} }
kfree(dev_info->name); kfree(dev_info->name);
visorchipset_device_destroy(dev_info); remove_visor_device(dev_info);
return 0; return 0;
err_respond: err_respond: