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

staging: unisys: fix CamelCase params in responder functions

Fix the CamelCase parameter names in the set of responder functions:

cmdId => cmd_id
busNo => bus_no
devNo => dev_no
responseState => response_state

Update all references to use the fixed names.
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4577225d
...@@ -768,60 +768,60 @@ visorchipset_save_message(struct controlvm_message *msg, ...@@ -768,60 +768,60 @@ visorchipset_save_message(struct controlvm_message *msg,
EXPORT_SYMBOL_GPL(visorchipset_save_message); EXPORT_SYMBOL_GPL(visorchipset_save_message);
static void static void
bus_responder(enum controlvm_id cmdId, ulong busNo, int response) bus_responder(enum controlvm_id cmd_id, ulong bus_no, int response)
{ {
struct visorchipset_bus_info *p = NULL; struct visorchipset_bus_info *p = NULL;
BOOL need_clear = FALSE; BOOL need_clear = FALSE;
p = findbus(&bus_info_list, busNo); p = findbus(&bus_info_list, bus_no);
if (!p) if (!p)
return; return;
if (response < 0) { if (response < 0) {
if ((cmdId == CONTROLVM_BUS_CREATE) && if ((cmd_id == CONTROLVM_BUS_CREATE) &&
(response != (-CONTROLVM_RESP_ERROR_ALREADY_DONE))) (response != (-CONTROLVM_RESP_ERROR_ALREADY_DONE)))
/* undo the row we just created... */ /* undo the row we just created... */
delbusdevices(&dev_info_list, busNo); delbusdevices(&dev_info_list, bus_no);
} else { } else {
if (cmdId == CONTROLVM_BUS_CREATE) if (cmd_id == CONTROLVM_BUS_CREATE)
p->state.created = 1; p->state.created = 1;
if (cmdId == CONTROLVM_BUS_DESTROY) if (cmd_id == CONTROLVM_BUS_DESTROY)
need_clear = TRUE; need_clear = TRUE;
} }
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) if (p->pending_msg_hdr.id == CONTROLVM_INVALID)
return; /* no controlvm response needed */ return; /* no controlvm response needed */
if (p->pending_msg_hdr.id != (u32) cmdId) if (p->pending_msg_hdr.id != (u32) cmd_id)
return; return;
controlvm_respond(&p->pending_msg_hdr, response); controlvm_respond(&p->pending_msg_hdr, response);
p->pending_msg_hdr.id = CONTROLVM_INVALID; p->pending_msg_hdr.id = CONTROLVM_INVALID;
if (need_clear) { if (need_clear) {
bus_info_clear(p); bus_info_clear(p);
delbusdevices(&dev_info_list, busNo); delbusdevices(&dev_info_list, bus_no);
} }
} }
static void static void
device_changestate_responder(enum controlvm_id cmdId, device_changestate_responder(enum controlvm_id cmd_id,
ulong busNo, ulong devNo, int response, ulong bus_no, ulong dev_no, int response,
struct spar_segment_state responseState) struct spar_segment_state response_state)
{ {
struct visorchipset_device_info *p = NULL; struct visorchipset_device_info *p = NULL;
struct controlvm_message outmsg; struct controlvm_message outmsg;
p = finddevice(&dev_info_list, busNo, devNo); p = finddevice(&dev_info_list, bus_no, dev_no);
if (!p) if (!p)
return; return;
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) if (p->pending_msg_hdr.id == CONTROLVM_INVALID)
return; /* no controlvm response needed */ return; /* no controlvm response needed */
if (p->pending_msg_hdr.id != cmdId) if (p->pending_msg_hdr.id != cmd_id)
return; return;
controlvm_init_response(&outmsg, &p->pending_msg_hdr, response); controlvm_init_response(&outmsg, &p->pending_msg_hdr, response);
outmsg.cmd.device_change_state.bus_no = busNo; outmsg.cmd.device_change_state.bus_no = bus_no;
outmsg.cmd.device_change_state.dev_no = devNo; outmsg.cmd.device_change_state.dev_no = dev_no;
outmsg.cmd.device_change_state.state = responseState; outmsg.cmd.device_change_state.state = response_state;
if (!visorchannel_signalinsert(controlvm_channel, if (!visorchannel_signalinsert(controlvm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) CONTROLVM_QUEUE_REQUEST, &outmsg))
...@@ -831,26 +831,26 @@ device_changestate_responder(enum controlvm_id cmdId, ...@@ -831,26 +831,26 @@ device_changestate_responder(enum controlvm_id cmdId,
} }
static void static void
device_responder(enum controlvm_id cmdId, ulong busNo, ulong devNo, device_responder(enum controlvm_id cmd_id, ulong bus_no, ulong dev_no,
int response) int response)
{ {
struct visorchipset_device_info *p = NULL; struct visorchipset_device_info *p = NULL;
BOOL need_clear = FALSE; BOOL need_clear = FALSE;
p = finddevice(&dev_info_list, busNo, devNo); p = finddevice(&dev_info_list, bus_no, dev_no);
if (!p) if (!p)
return; return;
if (response >= 0) { if (response >= 0) {
if (cmdId == CONTROLVM_DEVICE_CREATE) if (cmd_id == CONTROLVM_DEVICE_CREATE)
p->state.created = 1; p->state.created = 1;
if (cmdId == CONTROLVM_DEVICE_DESTROY) if (cmd_id == CONTROLVM_DEVICE_DESTROY)
need_clear = TRUE; need_clear = TRUE;
} }
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) if (p->pending_msg_hdr.id == CONTROLVM_INVALID)
return; /* no controlvm response needed */ return; /* no controlvm response needed */
if (p->pending_msg_hdr.id != (u32) cmdId) if (p->pending_msg_hdr.id != (u32) cmd_id)
return; return;
controlvm_respond(&p->pending_msg_hdr, response); controlvm_respond(&p->pending_msg_hdr, response);
......
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