Commit 3dbf7b73 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: Fix VMCALL_IO_DIAG_ADDR_PARAMS 



Remove the typedef from VMCALL_IO_DIAG_ADDR_PARAMS and use the name
struct vmcall_io_diag_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 f42aea3c

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

+3 −3
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ struct vmcall_io_controlvm_addr_params { 
/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */

#pragma pack(push, 1)

/* Parameters to VMCALL_IO_DIAG_ADDR interface */

typedef struct _VMCALL_IO_DIAG_ADDR_PARAMS {

struct vmcall_io_diag_addr_params {

	    /* The Guest-relative physical address of the diagnostic channel.

	    * This VMCall fills this in with the appropriate address. */

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

} VMCALL_IO_DIAG_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
@@ -235,14 +235,14 @@ issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes) 


static inline unsigned int issue_vmcall_io_diag_addr(u64 *diag_channel_addr)

{

	VMCALL_IO_DIAG_ADDR_PARAMS params;

	struct vmcall_io_diag_addr_params params;

	int result = VMCALL_SUCCESS;

	u64 physaddr;



	physaddr = virt_to_phys(&params);

	ISSUE_IO_VMCALL(VMCALL_IO_DIAG_ADDR, physaddr, result);

	if (VMCALL_SUCCESSFUL(result))

		*diag_channel_addr = params.ChannelAddress;

		*diag_channel_addr = params.address;

	return result;

}