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

Commit 8f334e30 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: bus_create no longer calls bus_epilog 



Have bus_create call chipset_bus_create directly instead of going
through the function bus_epilog.

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 ca1cbf90

drivers/staging/unisys/visorbus/visorchipset.c

+28 −5
Original line number Original line Diff line number Diff line
@@ -717,6 +717,7 @@ bus_epilog(struct visor_device *bus_info, 
			POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,

			POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,

					 bus_info->chipset_bus_no,

					 bus_info->chipset_bus_no,

					 POSTCODE_SEVERITY_ERR);

					 POSTCODE_SEVERITY_ERR);

			goto out_respond;

			return;

			return;

		}

		}
@@ -825,6 +826,7 @@ static void 
bus_create(struct controlvm_message *inmsg)

bus_create(struct controlvm_message *inmsg)

{

{

	struct controlvm_message_packet *cmd = &inmsg->cmd;

	struct controlvm_message_packet *cmd = &inmsg->cmd;

	struct controlvm_message_header *pmsg_hdr = NULL;

	u32 bus_no = cmd->create_bus.bus_no;

	u32 bus_no = cmd->create_bus.bus_no;

	int rc = CONTROLVM_RESP_SUCCESS;

	int rc = CONTROLVM_RESP_SUCCESS;

	struct visor_device *bus_info;

	struct visor_device *bus_info;
@@ -860,19 +862,40 @@ bus_create(struct controlvm_message *inmsg) 
		POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,

		POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,

				 POSTCODE_SEVERITY_ERR);

				 POSTCODE_SEVERITY_ERR);

		rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;

		rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;

		kfree(bus_info);

		goto out_free_bus_info;

		bus_info = NULL;

		goto out_bus_epilog;

	}

	}

	bus_info->visorchannel = visorchannel;

	bus_info->visorchannel = visorchannel;



	if (uuid_le_cmp(cmd->create_bus.bus_inst_uuid, spar_siovm_uuid) == 0)

	if (uuid_le_cmp(cmd->create_bus.bus_inst_uuid, spar_siovm_uuid) == 0)

		save_crash_message(inmsg, CRASH_BUS);

		save_crash_message(inmsg, CRASH_BUS);





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

		pmsg_hdr = kzalloc(sizeof(*pmsg_hdr),

				   GFP_KERNEL);

		if (!pmsg_hdr) {

			POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,

					 bus_info->chipset_bus_no,

					 POSTCODE_SEVERITY_ERR);

			rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;

			goto out_free_bus_info;

		}



		memcpy(pmsg_hdr, &inmsg->hdr,

		       sizeof(struct controlvm_message_header));

		bus_info->pending_msg_hdr = pmsg_hdr;

	}



	chipset_bus_create(bus_info);



	POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);

	POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);

	return;



out_free_bus_info:

	kfree(bus_info);





out_bus_epilog:

out_bus_epilog:

	bus_epilog(bus_info, CONTROLVM_BUS_CREATE, &inmsg->hdr,

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

		   rc, inmsg->hdr.flags.response_expected == 1);

		bus_responder(CONTROLVM_BUS_CREATE, &inmsg->hdr, rc);

}

}





static void

static void