diff options
| author | David Kershner <david.kershner@unisys.com> | 2017-03-28 09:34:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-29 09:17:03 +0200 |
| commit | 40b3e1ac05f09a6b6f1924739d29312e7cb5b1e5 (patch) | |
| tree | 86cc5ac1e1256c3efa29c8d1cadc7ef30a27211d /drivers | |
| parent | c9808ff18674dcd482f21811456e5fa254434858 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorchipset.c | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorbus/vmcallinterface.h | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 260307b83a2f..b6e2b8e8d44e 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 8d5a84ff2bb0..abc10fac08af 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 */ |