]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: unisys: visorbus: fix my_create_device goto statements
authorDavid Kershner <david.kershner@unisys.com>
Fri, 11 Mar 2016 22:01:44 +0000 (17:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Mar 2016 14:30:36 +0000 (07:30 -0700)
Don't use the abmiguous cleanup, make it more meaningful.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Timothy Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorbus/visorchipset.c

index b1c5e9e78679bc24d8b475edf6407f01f9b4c634..17bedbc6761d940a240c7cd77c001296152e1544 100644 (file)
@@ -1255,14 +1255,14 @@ my_device_create(struct controlvm_message *inmsg)
                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto cleanup;
+               goto out_respond;
        }
 
        if (bus_info->state.created == 0) {
                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-               goto cleanup;
+               goto out_respond;
        }
 
        dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
@@ -1270,7 +1270,7 @@ my_device_create(struct controlvm_message *inmsg)
                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-               goto cleanup;
+               goto out_respond;
        }
 
        dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL);
@@ -1278,7 +1278,7 @@ my_device_create(struct controlvm_message *inmsg)
                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
                                 POSTCODE_SEVERITY_ERR);
                rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-               goto cleanup;
+               goto out_respond;
        }
 
        dev_info->chipset_bus_no = bus_no;
@@ -1303,7 +1303,7 @@ my_device_create(struct controlvm_message *inmsg)
                rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
                kfree(dev_info);
                dev_info = NULL;
-               goto cleanup;
+               goto out_respond;
        }
        dev_info->visorchannel = visorchannel;
        dev_info->channel_type_guid = cmd->create_device.data_type_uuid;
@@ -1313,7 +1313,7 @@ my_device_create(struct controlvm_message *inmsg)
 
        POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,
                         POSTCODE_SEVERITY_INFO);
-cleanup:
+out_respond:
        device_epilog(dev_info, segment_state_running,
                      CONTROLVM_DEVICE_CREATE, &inmsg->hdr, rc,
                      inmsg->hdr.flags.response_expected == 1, 1);