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: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index a7830cac9b8ce185a2b960c0ce61600d254b9a2f..c9dc51896287dde3eb62a4fa1432c947a5091a96 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -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 /////////////////////////// */

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 2ccf155b08cd910f6f5acc4198a65b9eb56a5af5..d6e8983be4c61d7fe9e2d67d0623f39c3e79f84d 100644 (file)
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -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;
 }