Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: unisys: visorbus: renamed functions like chipset_device_* to match driver namespace 



Renamed functions
* chipset_device_create() to visorchipset_device_create()
* chipset_device_destroy() to visorchipset_device_destroy()
* chipset_device_pause() to visorchipset_device_pause()
* chipset_device_resume() to visorchipset_device_resume()

Signed-off-by: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Reported-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f96c730

drivers/staging/unisys/visorbus/visorbus_main.c

+6 −6
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ visorchipset_bus_destroy(struct visor_device *dev) 
}



int

chipset_device_create(struct visor_device *dev_info)

visorchipset_device_create(struct visor_device *dev_info)

{

	int err;
@@ -1113,7 +1113,7 @@ chipset_device_create(struct visor_device *dev_info) 
}



void

chipset_device_destroy(struct visor_device *dev_info)

visorchipset_device_destroy(struct visor_device *dev_info)

{

	remove_visor_device(dev_info);
@@ -1211,7 +1211,7 @@ initiate_chipset_device_pause_resume(struct visor_device *dev, bool is_pause) 
}



/**

 * chipset_device_pause() - start a pause operation for a visor device

 * visorchipset_device_pause() - start a pause operation for a visor device

 * @dev_info: struct visor_device identifying the device being paused

 *

 * Tell the subordinate function driver for a specific device to pause
@@ -1219,7 +1219,7 @@ initiate_chipset_device_pause_resume(struct visor_device *dev, bool is_pause) 
 * via a callback function; see pause_state_change_complete().

 */

int

chipset_device_pause(struct visor_device *dev_info)

visorchipset_device_pause(struct visor_device *dev_info)

{

	int err;
@@ -1234,7 +1234,7 @@ chipset_device_pause(struct visor_device *dev_info) 
}



/**

 * chipset_device_resume() - start a resume operation for a visor device

 * visorchipset_device_resume() - start a resume operation for a visor device

 * @dev_info: struct visor_device identifying the device being resumed

 *

 * Tell the subordinate function driver for a specific device to resume
@@ -1242,7 +1242,7 @@ chipset_device_pause(struct visor_device *dev_info) 
 * via a callback function; see resume_state_change_complete().

 */

int

chipset_device_resume(struct visor_device *dev_info)

visorchipset_device_resume(struct visor_device *dev_info)

{

	int err;

drivers/staging/unisys/visorbus/visorbus_private.h

+4 −4
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 


int visorchipset_bus_create(struct visor_device *bus_info);

void visorchipset_bus_destroy(struct visor_device *bus_info);

int chipset_device_create(struct visor_device *dev_info);

void chipset_device_destroy(struct visor_device *dev_info);

int chipset_device_pause(struct visor_device *dev_info);

int chipset_device_resume(struct visor_device *dev_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);

int visorchipset_device_resume(struct visor_device *dev_info);



void visorbus_create_response(struct visor_device *p, int response);

void visorbus_destroy_response(struct visor_device *p, int response);

drivers/staging/unisys/visorbus/visorchipset.c

+7 −7
Original line number Diff line number Diff line
@@ -824,8 +824,8 @@ my_device_create(struct controlvm_message *inmsg) 
		       sizeof(struct controlvm_message_header));

		dev_info->pending_msg_hdr = pmsg_hdr;

	}

	/* Chipset_device_create will send response */

	err = chipset_device_create(dev_info);

	/* visorchipset_device_create will send response */

	err = visorchipset_device_create(dev_info);

	if (err)

		goto err_destroy_visorchannel;
@@ -882,16 +882,16 @@ my_device_changestate(struct controlvm_message *inmsg) 


	if (state.alive == segment_state_running.alive &&

	    state.operating == segment_state_running.operating)

		/* Response will be sent from chipset_device_resume */

		err = chipset_device_resume(dev_info);

		/* Response will be sent from visorchipset_device_resume */

		err = visorchipset_device_resume(dev_info);

	/* ServerNotReady / ServerLost / SegmentStateStandby */

	else if (state.alive == segment_state_standby.alive &&

		 state.operating == segment_state_standby.operating)

		/*

		 * technically this is standby case where server is lost.

		 * Response will be sent from chipset_device_pause.

		 * Response will be sent from visorchipset_device_pause.

		 */

		err = chipset_device_pause(dev_info);

		err = visorchipset_device_pause(dev_info);

	if (err)

		goto err_respond;
@@ -941,7 +941,7 @@ my_device_destroy(struct controlvm_message *inmsg) 
		dev_info->pending_msg_hdr = pmsg_hdr;

	}



	chipset_device_destroy(dev_info);

	visorchipset_device_destroy(dev_info);

	return 0;



err_respond: