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

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

staging: unisys: visorbus: fix my_create_device goto statements 



Don't use the abmiguous cleanup, make it more meaningful.

Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarTimothy Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 368acb3f

drivers/staging/unisys/visorbus/visorchipset.c

+6 −6
Original line number Diff line number Diff line
@@ -1255,14 +1255,14 @@ my_device_create(struct controlvm_message *inmsg) 
		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,

				 POSTCODE_SEVERITY_ERR);

		rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;

		goto cleanup;

		goto out_respond;

	}



	if (bus_info->state.created == 0) {

		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,

				 POSTCODE_SEVERITY_ERR);

		rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;

		goto cleanup;

		goto out_respond;

	}



	dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
@@ -1270,7 +1270,7 @@ my_device_create(struct controlvm_message *inmsg) 
		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,

				 POSTCODE_SEVERITY_ERR);

		rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;

		goto cleanup;

		goto out_respond;

	}



	dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL);
@@ -1278,7 +1278,7 @@ my_device_create(struct controlvm_message *inmsg) 
		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,

				 POSTCODE_SEVERITY_ERR);

		rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;

		goto cleanup;

		goto out_respond;

	}



	dev_info->chipset_bus_no = bus_no;
@@ -1303,7 +1303,7 @@ my_device_create(struct controlvm_message *inmsg) 
		rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;

		kfree(dev_info);

		dev_info = NULL;

		goto cleanup;

		goto out_respond;

	}

	dev_info->visorchannel = visorchannel;

	dev_info->channel_type_guid = cmd->create_device.data_type_uuid;
@@ -1313,7 +1313,7 @@ my_device_create(struct controlvm_message *inmsg) 


	POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,

			 POSTCODE_SEVERITY_INFO);

cleanup:

out_respond:

	device_epilog(dev_info, segment_state_running,

		      CONTROLVM_DEVICE_CREATE, &inmsg->hdr, rc,

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