Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
The function visorchipset_device_create just called create_visor_device,
we can just combine it with create_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:34 -04:00 committed by Greg Kroah-Hartman
parent a7093ba162
commit 51c0f81cca
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,7 +658,7 @@ EXPORT_SYMBOL_GPL(visorbus_disable_channel_interrupts);
* Return: 0 if successful, otherwise the negative value returned by * Return: 0 if successful, otherwise the negative value returned by
* device_add() indicating the reason for failure * device_add() indicating the reason for failure
*/ */
static int create_visor_device(struct visor_device *dev) int create_visor_device(struct visor_device *dev)
{ {
int err; int err;
u32 chipset_bus_no = dev->chipset_bus_no; u32 chipset_bus_no = dev->chipset_bus_no;
@ -705,6 +705,8 @@ static int create_visor_device(struct visor_device *dev)
goto err_put; goto err_put;
list_add_tail(&dev->list_all, &list_all_device_instances); list_add_tail(&dev->list_all, &list_all_device_instances);
dev->state.created = 1;
visorbus_response(dev, err, CONTROLVM_DEVICE_CREATE);
/* success: reference kept via unmatched get_device() */ /* success: reference kept via unmatched get_device() */
return 0; return 0;
@ -1117,20 +1119,6 @@ static void remove_all_visor_devices(void)
} }
} }
int visorchipset_device_create(struct visor_device *dev_info)
{
int err;
err = create_visor_device(dev_info);
if (err < 0)
return err;
visorbus_response(dev_info, err, CONTROLVM_DEVICE_CREATE);
dev_info->state.created = 1;
return 0;
}
void visorchipset_device_destroy(struct visor_device *dev_info) void visorchipset_device_destroy(struct visor_device *dev_info)
{ {
remove_visor_device(dev_info); remove_visor_device(dev_info);

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

@ -25,7 +25,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 visorchipset_device_create(struct visor_device *dev_info); int create_visor_device(struct visor_device *dev_info);
void visorchipset_device_destroy(struct visor_device *dev_info); void visorchipset_device_destroy(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);

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

@ -833,8 +833,8 @@ static int visorbus_device_create(struct controlvm_message *inmsg)
sizeof(struct controlvm_message_header)); sizeof(struct controlvm_message_header));
dev_info->pending_msg_hdr = pmsg_hdr; dev_info->pending_msg_hdr = pmsg_hdr;
} }
/* visorchipset_device_create will send response */ /* create_visor_device will send response */
err = visorchipset_device_create(dev_info); err = create_visor_device(dev_info);
if (err) if (err)
goto err_destroy_visorchannel; goto err_destroy_visorchannel;