]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: unisys: Fix CamelCase in uislib_client_inject_add_vnic()
authorBenjamin Romer <benjamin.romer@unisys.com>
Fri, 3 Oct 2014 18:09:05 +0000 (14:09 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Oct 2014 02:29:05 +0000 (10:29 +0800)
Fix CamelCase names:
busNo => bus_no
devNo => dev_no
instGuid => inst_uuid

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/include/uisutils.h
drivers/staging/unisys/uislib/uislib.c

index 3a232bebed6b909b4ef298f1f86365c20eed0520..cbfbd9eac5a5f36b41600eb2b70bbad63f792fd1 100644 (file)
@@ -143,9 +143,9 @@ int uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
 int  uislib_client_inject_pause_vhba(u32 bus_no, u32 dev_no);
 int  uislib_client_inject_resume_vhba(u32 bus_no, u32 dev_no);
 int uislib_client_inject_del_vhba(u32 bus_no, u32 dev_no);
-int uislib_client_inject_add_vnic(u32 busNo, u32 devNo,
+int uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
                                  u64 phys_chan_addr, u32 chan_bytes,
-                                 int is_test_addr, uuid_le instGuid,
+                                 int is_test_addr, uuid_le inst_uuid,
                                  struct InterruptInfo *intr);
 int uislib_client_inject_pause_vnic(u32 busNo, u32 devNo);
 int uislib_client_inject_resume_vnic(u32 busNo, u32 devNo);
index 5b897a9bb3e7016aeb5c1bf9d55c45372017f58b..368b366bb47661717222cd2e4086e6801aa5edf5 100644 (file)
@@ -981,19 +981,19 @@ uislib_client_inject_del_vhba(u32 bus_no, u32 dev_no)
 EXPORT_SYMBOL_GPL(uislib_client_inject_del_vhba);
 
 int
-uislib_client_inject_add_vnic(u32 busNo, u32 devNo,
+uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
                              u64 phys_chan_addr, u32 chan_bytes,
-                             int is_test_addr, uuid_le instGuid,
+                             int is_test_addr, uuid_le inst_uuid,
                              struct InterruptInfo *intr)
 {
        CONTROLVM_MESSAGE msg;
 
-       LOGINF(" enter busNo=0x%x devNo=0x%x\n", busNo, devNo);
+       LOGINF(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);
        /* chipset init'ed with bus bus has been previously created -
        * Verify it still exists step 2: create the VNIC device on the
        * bus
        */
-       POSTCODE_LINUX_4(VNIC_CREATE_ENTRY_PC, devNo, busNo,
+       POSTCODE_LINUX_4(VNIC_CREATE_ENTRY_PC, dev_no, bus_no,
                         POSTCODE_SEVERITY_INFO);
 
        init_msg_header(&msg, CONTROLVM_DEVICE_CREATE, 0, 0);
@@ -1002,9 +1002,9 @@ uislib_client_inject_add_vnic(u32 busNo, u32 devNo,
                 * need to be ioremap()ed
                 */
                msg.hdr.Flags.testMessage = 1;
-       msg.cmd.createDevice.busNo = busNo;
-       msg.cmd.createDevice.devNo = devNo;
-       msg.cmd.createDevice.devInstGuid = instGuid;
+       msg.cmd.createDevice.busNo = bus_no;
+       msg.cmd.createDevice.devNo = dev_no;
+       msg.cmd.createDevice.devInstGuid = inst_uuid;
        if (intr)
                msg.cmd.createDevice.intr = *intr;
        else
@@ -1022,12 +1022,12 @@ uislib_client_inject_add_vnic(u32 busNo, u32 devNo,
        msg.cmd.createDevice.dataTypeGuid = UltraVnicChannelProtocolGuid;
        if (create_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
                LOGERR("VNIC create_device failed.\n");
-               POSTCODE_LINUX_4(VNIC_CREATE_FAILURE_PC, devNo, busNo,
+               POSTCODE_LINUX_4(VNIC_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                return 0;
        }
 
-       POSTCODE_LINUX_4(VNIC_CREATE_SUCCESS_PC, devNo, busNo,
+       POSTCODE_LINUX_4(VNIC_CREATE_SUCCESS_PC, dev_no, bus_no,
                         POSTCODE_SEVERITY_INFO);
        return 1;
 }