openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: fix CamelCase in create_bus() 

Fix CamelCase local variable names:

busNo => bus_no
deviceCount => dev_count

Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2014-12-05 17:08:53 -05:00 committed by Greg Kroah-Hartman
parent eb4a146802
commit d0500864c6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/unisys/uislib/uislib.c
View File

@ -149,7 +149,7 @@ static __iomem void *init_vbus_channel(u64 ch_addr, u32 ch_bytes)
static int static int
create_bus(struct controlvm_message *msg, char *buf) create_bus(struct controlvm_message *msg, char *buf)
{ {
u32 busNo, deviceCount; u32 bus_no, dev_count;
struct bus_info *tmp, *bus; struct bus_info *tmp, *bus;
size_t size; size_t size;
@ -161,19 +161,19 @@ create_bus(struct controlvm_message *msg, char *buf)
return CONTROLVM_RESP_ERROR_MAX_BUSES; return CONTROLVM_RESP_ERROR_MAX_BUSES;
} }
busNo = msg->cmd.create_bus.bus_no; bus_no = msg->cmd.create_bus.bus_no;
deviceCount = msg->cmd.create_bus.dev_count; dev_count = msg->cmd.create_bus.dev_count;
POSTCODE_LINUX_4(BUS_CREATE_ENTRY_PC, busNo, deviceCount, POSTCODE_LINUX_4(BUS_CREATE_ENTRY_PC, bus_no, dev_count,
POSTCODE_SEVERITY_INFO); POSTCODE_SEVERITY_INFO);
size = size =
sizeof(struct bus_info) + sizeof(struct bus_info) +
(deviceCount * sizeof(struct device_info *)); (dev_count * sizeof(struct device_info *));
bus = kzalloc(size, GFP_ATOMIC); bus = kzalloc(size, GFP_ATOMIC);
if (!bus) { if (!bus) {
LOGERR("CONTROLVM_BUS_CREATE Failed: kmalloc for bus failed.\n"); LOGERR("CONTROLVM_BUS_CREATE Failed: kmalloc for 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 CONTROLVM_RESP_ERROR_KMALLOC_FAILED; return CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
} }
@ -184,14 +184,14 @@ create_bus(struct controlvm_message *msg, char *buf)
if (msg->hdr.flags.test_message) { if (msg->hdr.flags.test_message) {
/* This implies we're the IOVM so set guest handle to 0... */ /* This implies we're the IOVM so set guest handle to 0... */
bus->guest_handle = 0; bus->guest_handle = 0;
bus->bus_no = busNo; bus->bus_no = bus_no;
bus->local_vnic = 1; bus->local_vnic = 1;
} else { } else {
bus->bus_no = busNo; bus->bus_no = bus_no;
bus->guest_handle = busNo; bus->guest_handle = bus_no;
} }
sprintf(bus->name, "%d", (int)bus->bus_no); sprintf(bus->name, "%d", (int)bus->bus_no);
bus->device_count = deviceCount; bus->device_count = dev_count;
bus->device = bus->device =
(struct device_info **)((char *)bus + sizeof(struct bus_info)); (struct device_info **)((char *)bus + sizeof(struct bus_info));
bus->bus_inst_uuid = msg->cmd.create_bus.bus_inst_uuid; bus->bus_inst_uuid = msg->cmd.create_bus.bus_inst_uuid;
@ -206,7 +206,7 @@ create_bus(struct controlvm_message *msg, char *buf)
} }
read_unlock(&bus_list_lock); read_unlock(&bus_list_lock);
if (tmp) { if (tmp) {
/* found a bus already in the list with same busNo - /* found a bus already in the list with same bus_no -
* reject add * reject add
*/ */
LOGERR("CONTROLVM_BUS_CREATE Failed: bus %d already exists.\n", LOGERR("CONTROLVM_BUS_CREATE Failed: bus %d already exists.\n",
@ -228,9 +228,9 @@ create_bus(struct controlvm_message *msg, char *buf)
struct guest_msgs cmd; struct guest_msgs cmd;
cmd.msgtype = GUEST_ADD_VBUS; cmd.msgtype = GUEST_ADD_VBUS;
cmd.add_vbus.bus_no = busNo; cmd.add_vbus.bus_no = bus_no;
cmd.add_vbus.chanptr = bus->bus_channel; cmd.add_vbus.chanptr = bus->bus_channel;
cmd.add_vbus.dev_count = deviceCount; cmd.add_vbus.dev_count = dev_count;
cmd.add_vbus.bus_uuid = msg->cmd.create_bus.bus_data_type_uuid; cmd.add_vbus.bus_uuid = msg->cmd.create_bus.bus_data_type_uuid;
cmd.add_vbus.instance_uuid = msg->cmd.create_bus.bus_inst_uuid; cmd.add_vbus.instance_uuid = msg->cmd.create_bus.bus_inst_uuid;
if (!virt_control_chan_func) { if (!virt_control_chan_func) {