[PATCH 32/41] staging: unisys: Fix VMCALL_IO_DIAG_ADDR_PARAMS

[Benjamin Romer]

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: Benjamin Romer <benjamin.ro...@unisys.com>
---
 drivers/staging/unisys/common-spar/include/vmcallinterface.h | 6 +++---
 drivers/staging/unisys/include/uisutils.h                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h 
b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index 4eeb401..a7830ca 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -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 /////////////////////////// */
diff --git a/drivers/staging/unisys/include/uisutils.h 
b/drivers/staging/unisys/include/uisutils.h
index 60c7bce..2ccf155 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -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;
 }
 
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel