Commit e1242538 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: Fix CamelCase in uislib_client_inject_add_bus()

Fix CamelCase names:
busNo => bus_no
instGuid => inst_uuid
channelAddr => channel_addr
nChannelBytes => n_channel_bytes
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99c4c5ae
...@@ -132,8 +132,8 @@ unsigned char *util_map_virt(struct phys_info *sg); ...@@ -132,8 +132,8 @@ unsigned char *util_map_virt(struct phys_info *sg);
void util_unmap_virt(struct phys_info *sg); void util_unmap_virt(struct phys_info *sg);
unsigned char *util_map_virt_atomic(struct phys_info *sg); unsigned char *util_map_virt_atomic(struct phys_info *sg);
void util_unmap_virt_atomic(void *buf); void util_unmap_virt_atomic(void *buf);
int uislib_client_inject_add_bus(u32 busNo, uuid_le instGuid, int uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
u64 channelAddr, ulong nChannelBytes); u64 channel_addr, ulong n_channel_bytes);
int uislib_client_inject_del_bus(u32 busNo); int uislib_client_inject_del_bus(u32 busNo);
int uislib_client_inject_add_vhba(u32 busNo, u32 devNo, int uislib_client_inject_add_vhba(u32 busNo, u32 devNo,
......
...@@ -822,14 +822,14 @@ delete_device_glue(u32 busNo, u32 devNo) ...@@ -822,14 +822,14 @@ delete_device_glue(u32 busNo, u32 devNo)
} }
int int
uislib_client_inject_add_bus(u32 busNo, uuid_le instGuid, uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
u64 channelAddr, ulong nChannelBytes) u64 channel_addr, ulong n_channel_bytes)
{ {
CONTROLVM_MESSAGE msg; CONTROLVM_MESSAGE msg;
LOGINF("enter busNo=0x%x\n", busNo); LOGINF("enter busNo=0x%x\n", bus_no);
/* step 0: init the chipset */ /* step 0: init the chipset */
POSTCODE_LINUX_3(CHIPSET_INIT_ENTRY_PC, busNo, POSTCODE_SEVERITY_INFO); POSTCODE_LINUX_3(CHIPSET_INIT_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
if (!chipset_inited) { if (!chipset_inited) {
/* step: initialize the chipset */ /* step: initialize the chipset */
...@@ -848,24 +848,25 @@ uislib_client_inject_add_bus(u32 busNo, uuid_le instGuid, ...@@ -848,24 +848,25 @@ uislib_client_inject_add_bus(u32 busNo, uuid_le instGuid,
return 0; return 0;
} }
LOGINF("chipset initialized\n"); LOGINF("chipset initialized\n");
POSTCODE_LINUX_3(CHIPSET_INIT_EXIT_PC, busNo, POSTCODE_LINUX_3(CHIPSET_INIT_EXIT_PC, bus_no,
POSTCODE_SEVERITY_INFO); POSTCODE_SEVERITY_INFO);
} }
/* step 1: create a bus */ /* step 1: create a bus */
POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, busNo, POSTCODE_SEVERITY_WARNING); POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, bus_no,
POSTCODE_SEVERITY_WARNING);
init_msg_header(&msg, CONTROLVM_BUS_CREATE, 0, 0); init_msg_header(&msg, CONTROLVM_BUS_CREATE, 0, 0);
msg.cmd.createBus.busNo = busNo; msg.cmd.createBus.busNo = bus_no;
msg.cmd.createBus.deviceCount = 23; /* devNo+1; */ msg.cmd.createBus.deviceCount = 23; /* devNo+1; */
msg.cmd.createBus.channelAddr = channelAddr; msg.cmd.createBus.channelAddr = channel_addr;
msg.cmd.createBus.channelBytes = nChannelBytes; msg.cmd.createBus.channelBytes = n_channel_bytes;
if (create_bus(&msg, NULL) != CONTROLVM_RESP_SUCCESS) { if (create_bus(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
LOGERR("create_bus failed.\n"); LOGERR("create_bus failed.\n");
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, busNo, POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
return 0; return 0;
} }
POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, busNo, POSTCODE_SEVERITY_INFO); POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment