staging: unisys: cleanup rc -1 in create_visor_device()
authorBenjamin Romer <benjamin.romer@unisys.com>
Tue, 23 Feb 2016 17:44:16 +0000 (12:44 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Feb 2016 06:40:52 +0000 (22:40 -0800)
Get rid of the rc = -1 initialization. Return a meaningful error on
failure in the function, or, the rc from a called function if it fails.

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

index 0add9ff..f81da4d 100644 (file)
@@ -973,7 +973,7 @@ EXPORT_SYMBOL_GPL(visorbus_disable_channel_interrupts);
 static int
 create_visor_device(struct visor_device *dev)
 {
-       int rc = -1;
+       int rc;
        u32 chipset_bus_no = dev->chipset_bus_no;
        u32 chipset_dev_no = dev->chipset_dev_no;
 
@@ -995,6 +995,7 @@ create_visor_device(struct visor_device *dev)
        if (!dev->periodic_work) {
                POSTCODE_LINUX_3(DEVICE_CREATE_FAILURE_PC, chipset_dev_no,
                                 DIAG_SEVERITY_ERR);
+               rc = -EINVAL;
                goto away;
        }
 
@@ -1032,14 +1033,15 @@ create_visor_device(struct visor_device *dev)
        if (rc < 0) {
                POSTCODE_LINUX_3(DEVICE_REGISTER_FAILURE_PC, chipset_dev_no,
                                 DIAG_SEVERITY_ERR);
-               goto away_register;
+               goto away_unregister;
        }
 
        list_add_tail(&dev->list_all, &list_all_device_instances);
        return 0;
 
-away_register:
+away_unregister:
        device_unregister(&dev->device);
+
 away:
        put_device(&dev->device);
        return rc;