Commit 0520cfb1 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: fix VMCALL_IO_VISORSERIAL_ADDR_PARAMS 



Remove the typedef from VMCALL_IO_VISORSERIAL_ADDR_PARAMS and use the
name struct vmcall_io_visorserial_addr_params instead. Fix CamelCase
member names:

ChannelAddress => address

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3dbf7b73

drivers/staging/unisys/common-spar/include/vmcallinterface.h

+3 −3
Original line number Diff line number Diff line
@@ -143,12 +143,12 @@ struct vmcall_io_diag_addr_params { 
/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */

#pragma pack(push, 1)

/* Parameters to VMCALL_IO_VISORSERIAL_ADDR interface */

typedef struct _VMCALL_IO_VISORSERIAL_ADDR_PARAMS {

struct vmcall_io_visorserial_addr_params {

	    /* The Guest-relative physical address of the serial console

	    * channel.  This VMCall fills this in with the appropriate

	    * address. */

	u64 ChannelAddress;	/* contents provided by this VMCALL (OUT) */

} VMCALL_IO_VISORSERIAL_ADDR_PARAMS;

	u64 address;	/* contents provided by this VMCALL (OUT) */

};



#pragma pack(pop)

/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */

drivers/staging/unisys/include/uisutils.h

+2 −2
Original line number Diff line number Diff line
@@ -248,14 +248,14 @@ static inline unsigned int issue_vmcall_io_diag_addr(u64 *diag_channel_addr) 


static inline unsigned int issue_vmcall_io_visorserial_addr(u64 *channel_addr)

{

	VMCALL_IO_VISORSERIAL_ADDR_PARAMS params;

	struct vmcall_io_visorserial_addr_params params;

	int result = VMCALL_SUCCESS;

	u64 physaddr;



	physaddr = virt_to_phys(&params);

	ISSUE_IO_VMCALL(VMCALL_IO_VISORSERIAL_ADDR, physaddr, result);

	if (VMCALL_SUCCESSFUL(result))

		*channel_addr = params.ChannelAddress;

		*channel_addr = params.address;

	return result;

}