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

The function visorchipset_bus_destroy just called viosrbus_remove_instance,
we can just combine it with visorbus_remove_instance.

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:33 -04:00 committed by Greg Kroah-Hartman
parent 17d3208c3f
commit a7093ba162
3 changed files with 5 additions and 10 deletions

View File

@ -1085,7 +1085,7 @@ err_debugfs_dir:
* visorbus_remove_instance() - remove a device instance for the visorbus itself
* @dev: struct visor_device indentifying the bus to remove
*/
static void visorbus_remove_instance(struct visor_device *dev)
void visorbus_remove_instance(struct visor_device *dev)
{
/*
* Note that this will result in the release method for
@ -1099,6 +1099,7 @@ static void visorbus_remove_instance(struct visor_device *dev)
kfree(dev->vbus_hdr_info);
list_del(&dev->list_all);
device_unregister(&dev->device);
visorbus_response(dev, 0, CONTROLVM_BUS_DESTROY);
}
/*
@ -1116,12 +1117,6 @@ static void remove_all_visor_devices(void)
}
}
void visorchipset_bus_destroy(struct visor_device *dev)
{
visorbus_remove_instance(dev);
visorbus_response(dev, 0, CONTROLVM_BUS_DESTROY);
}
int visorchipset_device_create(struct visor_device *dev_info)
{
int err;

View File

@ -24,7 +24,7 @@
#include "visorbus.h"
int visorbus_create_instance(struct visor_device *dev);
void visorchipset_bus_destroy(struct visor_device *bus_info);
void visorbus_remove_instance(struct visor_device *bus_info);
int visorchipset_device_create(struct visor_device *dev_info);
void visorchipset_device_destroy(struct visor_device *dev_info);
int visorchipset_device_pause(struct visor_device *dev_info);

View File

@ -700,8 +700,8 @@ static int visorbus_destroy(struct controlvm_message *inmsg)
bus_info->pending_msg_hdr = pmsg_hdr;
}
/* Response will be handled by visorchipset_bus_destroy */
visorchipset_bus_destroy(bus_info);
/* Response will be handled by visorbus_remove_instance */
visorbus_remove_instance(bus_info);
return 0;
err_respond: