Commit b74856b4 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman
Browse files

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: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51c0f81c

drivers/staging/unisys/visorbus/visorbus_main.c

+2 −7
Original line number Diff line number Diff line
@@ -716,11 +716,12 @@ err_put: 
	return err;

}



static void remove_visor_device(struct visor_device *dev)

void remove_visor_device(struct visor_device *dev)

{

	list_del(&dev->list_all);

	put_device(&dev->device);

	device_unregister(&dev->device);

	visorbus_response(dev, 0, CONTROLVM_DEVICE_DESTROY);

}



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

 *                                 visorbus function driver when a

drivers/staging/unisys/visorbus/visorbus_private.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
int visorbus_create_instance(struct visor_device *dev);

void visorbus_remove_instance(struct visor_device *bus_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_resume(struct visor_device *dev_info);

drivers/staging/unisys/visorbus/visorchipset.c

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static int visorbus_device_destroy(struct controlvm_message *inmsg) 
	}



	kfree(dev_info->name);

	visorchipset_device_destroy(dev_info);

	remove_visor_device(dev_info);

	return 0;



err_respond:

CRA Git | Maintained and supported by SUSTech CRA and CCSE