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

staging: unisys: visorbus: move parser_init_byte_stream 



The function parser_init_byte_stream needs to be moved lower in the file to
avoid extraneous function prototypes.

Reported-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
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 1b1d463d

drivers/staging/unisys/visorbus/visorchipset.c

+58 −58
Original line number Diff line number Diff line
@@ -334,64 +334,6 @@ static void controlvm_respond_physdev_changestate( 


static void parser_done(struct parser_context *ctx);



static struct parser_context *

parser_init_byte_stream(u64 addr, u32 bytes, bool local, bool *retry)

{

	int allocbytes = sizeof(struct parser_context) + bytes;

	struct parser_context *ctx;



	if (retry)

		*retry = false;



	/*

	 * alloc an 0 extra byte to ensure payload is

	 * '\0'-terminated

	 */

	allocbytes++;

	if ((controlvm_payload_bytes_buffered + bytes)

	    > MAX_CONTROLVM_PAYLOAD_BYTES) {

		if (retry)

			*retry = true;

		return NULL;

	}

	ctx = kzalloc(allocbytes, GFP_KERNEL | __GFP_NORETRY);

	if (!ctx) {

		if (retry)

			*retry = true;

		return NULL;

	}



	ctx->allocbytes = allocbytes;

	ctx->param_bytes = bytes;

	ctx->curr = NULL;

	ctx->bytes_remaining = 0;

	ctx->byte_stream = false;

	if (local) {

		void *p;



		if (addr > virt_to_phys(high_memory - 1))

			goto err_finish_ctx;

		p = __va((unsigned long)(addr));

		memcpy(ctx->data, p, bytes);

	} else {

		void *mapping = memremap(addr, bytes, MEMREMAP_WB);



		if (!mapping)

			goto err_finish_ctx;

		memcpy(ctx->data, mapping, bytes);

		memunmap(mapping);

	}



	ctx->byte_stream = true;

	controlvm_payload_bytes_buffered += ctx->param_bytes;



	return ctx;



err_finish_ctx:

	parser_done(ctx);

	return NULL;

}



static uuid_le

parser_id_get(struct parser_context *ctx)

{
@@ -1906,6 +1848,64 @@ visorchipset_file_cleanup(dev_t major_dev) 
	unregister_chrdev_region(major_dev, 1);

}



static struct parser_context *

parser_init_byte_stream(u64 addr, u32 bytes, bool local, bool *retry)

{

	int allocbytes = sizeof(struct parser_context) + bytes;

	struct parser_context *ctx;



	if (retry)

		*retry = false;



	/*

	 * alloc an 0 extra byte to ensure payload is

	 * '\0'-terminated

	 */

	allocbytes++;

	if ((controlvm_payload_bytes_buffered + bytes)

	    > MAX_CONTROLVM_PAYLOAD_BYTES) {

		if (retry)

			*retry = true;

		return NULL;

	}

	ctx = kzalloc(allocbytes, GFP_KERNEL | __GFP_NORETRY);

	if (!ctx) {

		if (retry)

			*retry = true;

		return NULL;

	}



	ctx->allocbytes = allocbytes;

	ctx->param_bytes = bytes;

	ctx->curr = NULL;

	ctx->bytes_remaining = 0;

	ctx->byte_stream = false;

	if (local) {

		void *p;



		if (addr > virt_to_phys(high_memory - 1))

			goto err_finish_ctx;

		p = __va((unsigned long)(addr));

		memcpy(ctx->data, p, bytes);

	} else {

		void *mapping = memremap(addr, bytes, MEMREMAP_WB);



		if (!mapping)

			goto err_finish_ctx;

		memcpy(ctx->data, mapping, bytes);

		memunmap(mapping);

	}



	ctx->byte_stream = true;

	controlvm_payload_bytes_buffered += ctx->param_bytes;



	return ctx;



err_finish_ctx:

	parser_done(ctx);

	return NULL;

}



/**

 * handle_command() - process a controlvm message

 * @inmsg:        the message to process