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

Commit 4fb2539c authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: consolidate bus_responder and device_responder 



With all the code churn, bus_responder and device_responder have become
identical, consolidate them to the same function.

Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f49a21d

drivers/staging/unisys/visorbus/visorchipset.c

+18 −32
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ) 
}



static int

bus_responder(enum controlvm_id cmd_id,

controlvm_responder(enum controlvm_id cmd_id,

		    struct controlvm_message_header *pending_msg_hdr,

		    int response)

{
@@ -574,20 +574,6 @@ device_changestate_responder(enum controlvm_id cmd_id, 
					 CONTROLVM_QUEUE_REQUEST, &outmsg);

}



static int

device_responder(enum controlvm_id cmd_id,

		 struct controlvm_message_header *pending_msg_hdr,

		 int response)

{

	if (!pending_msg_hdr)

		return -EIO;



	if (pending_msg_hdr->id != (u32)cmd_id)

		return -EINVAL;



	return controlvm_respond(pending_msg_hdr, response);

}



static int

bus_create(struct controlvm_message *inmsg)

{
@@ -675,7 +661,7 @@ bus_create(struct controlvm_message *inmsg) 


err_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		bus_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return err;

}
@@ -723,7 +709,7 @@ bus_destroy(struct controlvm_message *inmsg) 


err_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		bus_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return err;

}
@@ -773,12 +759,12 @@ bus_configure(struct controlvm_message *inmsg, 
		       DIAG_SEVERITY_PRINT);



	if (inmsg->hdr.flags.response_expected == 1)

		bus_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return 0;



err_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		bus_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return err;

}
@@ -884,7 +870,7 @@ my_device_create(struct controlvm_message *inmsg) 


err_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		device_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return err;

}
@@ -945,7 +931,7 @@ my_device_changestate(struct controlvm_message *inmsg) 


err_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		device_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return err;

}
@@ -991,7 +977,7 @@ my_device_destroy(struct controlvm_message *inmsg) 


err_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		device_responder(inmsg->hdr.id, &inmsg->hdr, err);

		controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);

	return err;

}
@@ -1484,7 +1470,7 @@ bus_create_response(struct visor_device *bus_info, int response) 
	if (response >= 0)

		bus_info->state.created = 1;



	bus_responder(CONTROLVM_BUS_CREATE, bus_info->pending_msg_hdr,

	controlvm_responder(CONTROLVM_BUS_CREATE, bus_info->pending_msg_hdr,

			    response);



	kfree(bus_info->pending_msg_hdr);
@@ -1494,7 +1480,7 @@ bus_create_response(struct visor_device *bus_info, int response) 
void

bus_destroy_response(struct visor_device *bus_info, int response)

{

	bus_responder(CONTROLVM_BUS_DESTROY, bus_info->pending_msg_hdr,

	controlvm_responder(CONTROLVM_BUS_DESTROY, bus_info->pending_msg_hdr,

			    response);



	kfree(bus_info->pending_msg_hdr);
@@ -1507,7 +1493,7 @@ device_create_response(struct visor_device *dev_info, int response) 
	if (response >= 0)

		dev_info->state.created = 1;



	device_responder(CONTROLVM_DEVICE_CREATE, dev_info->pending_msg_hdr,

	controlvm_responder(CONTROLVM_DEVICE_CREATE, dev_info->pending_msg_hdr,

			    response);



	kfree(dev_info->pending_msg_hdr);
@@ -1517,7 +1503,7 @@ device_create_response(struct visor_device *dev_info, int response) 
void

device_destroy_response(struct visor_device *dev_info, int response)

{

	device_responder(CONTROLVM_DEVICE_DESTROY, dev_info->pending_msg_hdr,

	controlvm_responder(CONTROLVM_DEVICE_DESTROY, dev_info->pending_msg_hdr,

			    response);



	kfree(dev_info->pending_msg_hdr);