[PATCH 7/7] staging: unisys: get rid of goto in visorchipset_ioctl()

[Benjamin Romer]

Remove another completely unnecessary goto and just return the values
directly.

Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
 drivers/staging/unisys/visorchipset/file.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/file.c 
b/drivers/staging/unisys/visorchipset/file.c
index b82bc4a..ced3fbe 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -166,7 +166,6 @@ visorchipset_mmap(struct file *file, struct vm_area_struct 
*vma)
 
 long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       int rc = SUCCESS;
        s64 adjustment;
        s64 vrtc_offset;
 
@@ -177,28 +176,21 @@ long visorchipset_ioctl(struct file *file, unsigned int 
cmd, unsigned long arg)
                vrtc_offset = issue_vmcall_query_guest_virtual_time_offset();
                if (copy_to_user
                    ((void __user *)arg, &vrtc_offset, sizeof(vrtc_offset))) {
-                       rc = -EFAULT;
-                       goto Away;
+                       return -EFAULT;
                }
                DBGINF("insde visorchipset_ioctl, cmd=%d, vrtc_offset=%lld",
                       cmd, vrtc_offset);
-               break;
+               return SUCCESS;
        case VMCALL_UPDATE_PHYSICAL_TIME:
                if (copy_from_user
                    (&adjustment, (void __user *)arg, sizeof(adjustment))) {
-                       rc = -EFAULT;
-                       goto Away;
+                       return -EFAULT;
                }
                DBGINF("insde visorchipset_ioctl, cmd=%d, adjustment=%lld", cmd,
                       adjustment);
-               rc = issue_vmcall_update_physical_time(adjustment);
-               break;
+               return issue_vmcall_update_physical_time(adjustment);
        default:
                LOGERR("visorchipset_ioctl received invalid command");
-               rc = -EFAULT;
-               break;
+               return -EFAULT;
        }
-Away:
-       DBGINF("exiting %d!", rc);
-       return rc;
 }
-- 
2.1.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel