From: David Kershner Date: Tue, 28 Mar 2017 13:34:58 +0000 (-0400) Subject: staging: unisys: visorbus: get rid of ISSUE_IO_VMCALL X-Git-Tag: v4.12-rc1~84^2~298 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40b3e1ac05f09a6b6f1924739d29312e7cb5b1e5;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Reviewed-by: Tim Sell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 260307b83a2fa..b6e2b8e8d44e2 100644 --- 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(¶ms); - 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 8d5a84ff2bb0b..abc10fac08af1 100644 --- 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 */