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

staging: unisys: visorbus: device_epilog: clean up gotos 

The away flag is ambiguous, rename it to out and appropriately
call the correct goto.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-04-04 23:31:38 -04:00 committed by Greg Kroah-Hartman
parent 1366a3db3d
commit 3cb3fa3b79
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -1041,30 +1041,30 @@ device_epilog(struct visor_device *dev_info,
bool need_response, bool for_visorbus) bool need_response, bool for_visorbus)
{ {
struct visorchipset_busdev_notifiers *notifiers; struct visorchipset_busdev_notifiers *notifiers;
bool notified = false;
struct controlvm_message_header *pmsg_hdr = NULL; struct controlvm_message_header *pmsg_hdr = NULL;
notifiers = &busdev_notifiers; notifiers = &busdev_notifiers;
down(&notifier_lock);
if (!dev_info) { if (!dev_info) {
/* relying on a valid passed in response code */ /* relying on a valid passed in response code */
/* be lazy and re-use msg_hdr for this failure, is this ok?? */ /* be lazy and re-use msg_hdr for this failure, is this ok?? */
pmsg_hdr = msg_hdr; pmsg_hdr = msg_hdr;
goto away; goto out_respond_and_unlock;
} }
if (dev_info->pending_msg_hdr) { if (dev_info->pending_msg_hdr) {
/* only non-NULL if dev is still waiting on a response */ /* only non-NULL if dev is still waiting on a response */
response = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT; response = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
pmsg_hdr = dev_info->pending_msg_hdr; pmsg_hdr = dev_info->pending_msg_hdr;
goto away; goto out_respond_and_unlock;
} }
if (need_response) { if (need_response) {
pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL); pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
if (!pmsg_hdr) { if (!pmsg_hdr) {
response = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED; response = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
goto away; goto out_respond_and_unlock;
} }
memcpy(pmsg_hdr, msg_hdr, memcpy(pmsg_hdr, msg_hdr,
@ -1072,13 +1072,12 @@ device_epilog(struct visor_device *dev_info,
dev_info->pending_msg_hdr = pmsg_hdr; dev_info->pending_msg_hdr = pmsg_hdr;
} }
down(&notifier_lock);
if (response >= 0) { if (response >= 0) {
switch (cmd) { switch (cmd) {
case CONTROLVM_DEVICE_CREATE: case CONTROLVM_DEVICE_CREATE:
if (notifiers->device_create) { if (notifiers->device_create) {
(*notifiers->device_create) (dev_info); (*notifiers->device_create) (dev_info);
notified = true; goto out_unlock;
} }
break; break;
case CONTROLVM_DEVICE_CHANGESTATE: case CONTROLVM_DEVICE_CHANGESTATE:
@ -1088,7 +1087,7 @@ device_epilog(struct visor_device *dev_info,
segment_state_running.operating) { segment_state_running.operating) {
if (notifiers->device_resume) { if (notifiers->device_resume) {
(*notifiers->device_resume) (dev_info); (*notifiers->device_resume) (dev_info);
notified = true; goto out_unlock;
} }
} }
/* ServerNotReady / ServerLost / SegmentStateStandby */ /* ServerNotReady / ServerLost / SegmentStateStandby */
@ -1100,32 +1099,23 @@ device_epilog(struct visor_device *dev_info,
*/ */
if (notifiers->device_pause) { if (notifiers->device_pause) {
(*notifiers->device_pause) (dev_info); (*notifiers->device_pause) (dev_info);
notified = true; goto out_unlock;
} }
} }
break; break;
case CONTROLVM_DEVICE_DESTROY: case CONTROLVM_DEVICE_DESTROY:
if (notifiers->device_destroy) { if (notifiers->device_destroy) {
(*notifiers->device_destroy) (dev_info); (*notifiers->device_destroy) (dev_info);
notified = true; goto out_unlock;
} }
break; break;
} }
} }
away:
if (notified) out_respond_and_unlock:
/* The callback function just called above is responsible
* for calling the appropriate visorchipset_busdev_responders
* function, which will call device_responder()
*/
;
else
/*
* Do not kfree(pmsg_hdr) as this is the failure path.
* The success path ('notified') will call the responder
* directly and kfree() there.
*/
device_responder(cmd, pmsg_hdr, response); device_responder(cmd, pmsg_hdr, response);
out_unlock:
up(&notifier_lock); up(&notifier_lock);
} }