summaryrefslogtreecommitdiffstats
path: root/drivers/staging/unisys
diff options
context:
space:
mode:
authorBenjamin Romer <benjamin.romer@unisys.com>2015-03-16 13:58:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 21:53:51 +0100
commitdff54cd605670171f2f01d5bd5be61079c0119fb (patch)
tree8fcdb46cee6ca055b8bdb95ad96058bcabf9fdc4 /drivers/staging/unisys
parent6c5fed359fc7f2fd0b3c5469d43a1b07c283e1f9 (diff)
downloadop-kernel-dev-dff54cd605670171f2f01d5bd5be61079c0119fb.zip
op-kernel-dev-dff54cd605670171f2f01d5bd5be61079c0119fb.tar.gz
staging: unisys: refactor bus_destroy()
Fix CamelCase names: busNo => bus_no pBusInfo => bus_info Update all references to use the corrected names, and remove the goto statements and labels entirely. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys')
-rw-r--r--drivers/staging/unisys/visorchipset/visorchipset_main.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index e8795ac..ac0a381 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1078,22 +1078,17 @@ static void
bus_destroy(struct controlvm_message *inmsg)
{
struct controlvm_message_packet *cmd = &inmsg->cmd;
- ulong busNo = cmd->destroy_bus.bus_no;
- struct visorchipset_bus_info *pBusInfo;
+ ulong bus_no = cmd->destroy_bus.bus_no;
+ struct visorchipset_bus_info *bus_info;
int rc = CONTROLVM_RESP_SUCCESS;
- pBusInfo = findbus(&bus_info_list, busNo);
- if (!pBusInfo) {
+ bus_info = findbus(&bus_info_list, bus_no);
+ if (!bus_info)
rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
- goto Away;
- }
- if (pBusInfo->state.created == 0) {
+ else if (bus_info->state.created == 0)
rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
- goto Away;
- }
-Away:
- bus_epilog(busNo, CONTROLVM_BUS_DESTROY, &inmsg->hdr,
+ bus_epilog(bus_no, CONTROLVM_BUS_DESTROY, &inmsg->hdr,
rc, inmsg->hdr.flags.response_expected == 1);
}
OpenPOWER on IntegriCloud