From 74658c562132d411a5ac4af118eafcc450493d26 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Tue, 30 Sep 2014 12:08:41 -0400 Subject: [PATCH] staging: unisys: Fix CamelCase in Issue_VMCALL_IO_CONTROLVM_ADDR() Fix CamelCase names: Issue_VMCALL_IO_CONTROLVM_ADDR => issue_vmcall_io_controlvm_addr ControlAddress => control_addr ControlBytes => control_bytes Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/include/uisutils.h | 6 +++--- drivers/staging/unisys/visorchipset/visorchipset_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h index f818d00abd4a..2e98f2dbe924 100644 --- a/drivers/staging/unisys/include/uisutils.h +++ b/drivers/staging/unisys/include/uisutils.h @@ -222,7 +222,7 @@ unsigned int uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, struct phys_info frags[]); static inline unsigned int -Issue_VMCALL_IO_CONTROLVM_ADDR(u64 *ControlAddress, u32 *ControlBytes) +issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes) { VMCALL_IO_CONTROLVM_ADDR_PARAMS params; int result = VMCALL_SUCCESS; @@ -231,8 +231,8 @@ Issue_VMCALL_IO_CONTROLVM_ADDR(u64 *ControlAddress, u32 *ControlBytes) physaddr = virt_to_phys(¶ms); ISSUE_IO_VMCALL(VMCALL_IO_CONTROLVM_ADDR, physaddr, result); if (VMCALL_SUCCESSFUL(result)) { - *ControlAddress = params.ChannelAddress; - *ControlBytes = params.ChannelBytes; + *control_addr = params.ChannelAddress; + *control_bytes = params.ChannelBytes; } return result; } diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index c299a0df5195..e5df39554a1a 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -1911,7 +1911,7 @@ static HOSTADDRESS controlvm_get_channel_address(void) u64 addr = 0; u32 size = 0; - if (!VMCALL_SUCCESSFUL(Issue_VMCALL_IO_CONTROLVM_ADDR(&addr, &size))) { + if (!VMCALL_SUCCESSFUL(issue_vmcall_io_controlvm_addr(&addr, &size))) { ERRDRV("%s - vmcall to determine controlvm channel addr failed", __func__); return 0; -- 2.39.5