staging: unisys: refactor initialize_controlvm_payload_info()
authorBenjamin Romer <benjamin.romer@unisys.com>
Mon, 16 Mar 2015 17:58:26 +0000 (13:58 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2015 20:53:53 +0000 (21:53 +0100)
Fix the CamelCased goto label:

Away => cleanup

and get rid of the NULL comparison.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorchipset/visorchipset_main.c

index 4fe1ad1d0d3a9e7b80dbd76a89f309e2969f27d0..7956ae71e82383d194ff274c8a6f121318c0a955 100644 (file)
@@ -1269,26 +1269,26 @@ initialize_controlvm_payload_info(HOSTADDRESS phys_addr, u64 offset, u32 bytes,
 
        if (!info) {
                rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
-               goto Away;
+               goto cleanup;
        }
        memset(info, 0, sizeof(struct controlvm_payload_info));
        if ((offset == 0) || (bytes == 0)) {
                rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
-               goto Away;
+               goto cleanup;
        }
        payload = ioremap_cache(phys_addr + offset, bytes);
        if (!payload) {
                rc = -CONTROLVM_RESP_ERROR_IOREMAP_FAILED;
-               goto Away;
+               goto cleanup;
        }
 
        info->offset = offset;
        info->bytes = bytes;
        info->ptr = payload;
 
-Away:
+cleanup:
        if (rc < 0) {
-               if (payload != NULL) {
+               if (payload) {
                        iounmap(payload);
                        payload = NULL;
                }