From: Benjamin Romer Date: Fri, 3 Oct 2014 18:09:03 +0000 (-0400) Subject: staging: unisys: Fix CamelCase in uislib_client_inject_resume_vhba() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ae47a51bfba0a848a15d580aa68ec7eeda377ddf;p=openwrt%2Fstaging%2Fblogic.git staging: unisys: Fix CamelCase in uislib_client_inject_resume_vhba() Fix CamelCase names: busNo => bus_no devNo => dev_no Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h index 27dc876d0316..408dca2d9d30 100644 --- a/drivers/staging/unisys/include/uisutils.h +++ b/drivers/staging/unisys/include/uisutils.h @@ -141,7 +141,7 @@ int uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no, int is_test_addr, uuid_le inst_uuid, struct InterruptInfo *intr); int uislib_client_inject_pause_vhba(u32 bus_no, u32 dev_no); -int uislib_client_inject_resume_vhba(u32 busNo, u32 devNo); +int uislib_client_inject_resume_vhba(u32 bus_no, u32 dev_no); int uislib_client_inject_del_vhba(u32 busNo, u32 devNo); int uislib_client_inject_add_vnic(u32 busNo, u32 devNo, u64 phys_chan_addr, u32 chan_bytes, diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c index 132126944acf..96e38bfcc1f8 100644 --- a/drivers/staging/unisys/uislib/uislib.c +++ b/drivers/staging/unisys/uislib/uislib.c @@ -901,19 +901,19 @@ uislib_client_inject_pause_vhba(u32 bus_no, u32 dev_no) EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vhba); int -uislib_client_inject_resume_vhba(u32 busNo, u32 devNo) +uislib_client_inject_resume_vhba(u32 bus_no, u32 dev_no) { CONTROLVM_MESSAGE msg; int rc; init_msg_header(&msg, CONTROLVM_DEVICE_CHANGESTATE, 0, 0); - msg.cmd.deviceChangeState.busNo = busNo; - msg.cmd.deviceChangeState.devNo = devNo; + msg.cmd.deviceChangeState.busNo = bus_no; + msg.cmd.deviceChangeState.devNo = dev_no; msg.cmd.deviceChangeState.state = SegmentStateRunning; rc = resume_device(&msg); if (rc != CONTROLVM_RESP_SUCCESS) { LOGERR("VHBA resume_device failed. busNo=0x%x devNo=0x%x\n", - busNo, devNo); + bus_no, dev_no); return rc; } return 0;