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

staging: unisys: visorbus: merging the visorbus_device_pause_response and... 


staging: unisys: visorbus: merging the visorbus_device_pause_response and visorbus_device_resume_response functions into one.

The functions viosrbus_device_pause_response() and
viosrbus_device_resume_response() are functionally similar.
Merging these functions into a single function called
visorbus_device_changestate_response().

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 76956aa7

drivers/staging/unisys/visorbus/visorbus_main.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1170,7 +1170,8 @@ static void pause_state_change_complete(struct visor_device *dev, int status) 
		return;

		return;





	dev->pausing = false;

	dev->pausing = false;

	visorbus_device_pause_response(dev, status);

	visorbus_device_changestate_response(dev, status,

					     segment_state_standby);

}

}





/*

/*
@@ -1194,7 +1195,8 @@ static void resume_state_change_complete(struct visor_device *dev, int status) 
	 * which will presumably want to send some sort of response to

	 * which will presumably want to send some sort of response to

	 * the initiator.

	 * the initiator.

	 */

	 */

	visorbus_device_resume_response(dev, status);

	visorbus_device_changestate_response(dev, status,

					     segment_state_running);

}

}





/*

/*

drivers/staging/unisys/visorbus/visorbus_private.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,8 +30,8 @@ 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);





void visorbus_response(struct visor_device *p, int response, int controlvm_id);

void visorbus_response(struct visor_device *p, int response, int controlvm_id);

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

void visorbus_device_changestate_response(struct visor_device *p, int response,

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

					  struct visor_segment_state state);





int visorbus_init(void);

int visorbus_init(void);

void visorbus_exit(void);

void visorbus_exit(void);

drivers/staging/unisys/visorbus/visorchipset.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -1455,23 +1455,12 @@ void visorbus_response(struct visor_device *bus_info, int response, 
	bus_info->pending_msg_hdr = NULL;

	bus_info->pending_msg_hdr = NULL;

}

}





void visorbus_device_pause_response(struct visor_device *dev_info,

void visorbus_device_changestate_response(struct visor_device *dev_info,

				    int response)

					  int response,

{

					  struct visor_segment_state state)

	device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE,

				     dev_info, response,

				     segment_state_standby);



	kfree(dev_info->pending_msg_hdr);

	dev_info->pending_msg_hdr = NULL;

}



void visorbus_device_resume_response(struct visor_device *dev_info,

				     int response)

{

{

	device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE,

	device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE,

				     dev_info, response,

				     dev_info, response, state);

				     segment_state_running);





	kfree(dev_info->pending_msg_hdr);

	kfree(dev_info->pending_msg_hdr);

	dev_info->pending_msg_hdr = NULL;

	dev_info->pending_msg_hdr = NULL;