staging: unisys: visorbus: get rid of ISSUE_IO_VMCALL

The macro ISSUE_IO_VMCALL was a wrapper around the function unisys_vmcall.
It doesn't need to exist and was just being noisy, so get rid of it.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 260307b..b6e2b8e 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -1362,7 +1362,7 @@ issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes)
        u64 physaddr;
 
        physaddr = virt_to_phys(&params);
-       ISSUE_IO_VMCALL(VMCALL_CONTROLVM_ADDR, physaddr, result);
+       unisys_vmcall(VMCALL_CONTROLVM_ADDR, physaddr, result);
        if (VMCALL_SUCCESSFUL(result)) {
                *control_addr = params.address;
                *control_bytes = params.channel_bytes;

diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index 8d5a84f..abc10fa 100644 (file)
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -81,13 +81,11 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
 #define VMCALL_SUCCESS 0
 #define VMCALL_SUCCESSFUL(result) (result == 0)
 
-#define unisys_vmcall(tuple, reg_ebx, reg_ecx) \
-       __unisys_vmcall_gnuc(tuple, reg_ebx, reg_ecx)
 #define unisys_extended_vmcall(tuple, reg_ebx, reg_ecx, reg_edx) \
        __unisys_extended_vmcall_gnuc(tuple, reg_ebx, reg_ecx, reg_edx)
-#define ISSUE_IO_VMCALL(method, param, result) \
-       (result = unisys_vmcall(method, (param) & 0xFFFFFFFF, \
-                               (param) >> 32))
+#define unisys_vmcall(method, param, result) \
+       (result = __unisys_vmcall_gnuc((method), (param) & 0xFFFFFFFF, \
+                                      (param) >> 32))
 
 /* Structures for IO VMCALLs */