[PATCH 3/7] staging: unisys: cleanup goto in create_visor_device()

Benjamin Romer benjamin.romer at unisys.com
Tue Feb 23 15:01:51 UTC 2016


Get rid of the rc = -1 initialization, and remove the goto
mess entirely. 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 at unisys.com>
---
 drivers/staging/unisys/visorbus/visorbus_main.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 0add9ffe..cb147fa 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -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,7 +995,8 @@ create_visor_device(struct visor_device *dev)
 	if (!dev->periodic_work) {
 		POSTCODE_LINUX_3(DEVICE_CREATE_FAILURE_PC, chipset_dev_no,
 				 DIAG_SEVERITY_ERR);
-		goto away;
+		put_device(&dev->device);
+		return -EINVAL;
 	}
 
 	/* bus_id must be a unique name with respect to this bus TYPE
@@ -1025,24 +1026,21 @@ create_visor_device(struct visor_device *dev)
 	if (rc < 0) {
 		POSTCODE_LINUX_3(DEVICE_ADD_PC, chipset_bus_no,
 				 DIAG_SEVERITY_ERR);
-		goto away;
+		put_device(&dev->device);
+		return rc;
 	}
 
 	rc = register_devmajorminor_attributes(dev);
 	if (rc < 0) {
 		POSTCODE_LINUX_3(DEVICE_REGISTER_FAILURE_PC, chipset_dev_no,
 				 DIAG_SEVERITY_ERR);
-		goto away_register;
+		device_unregister(&dev->device);
+		put_device(&dev->device);
+		return rc;
 	}
 
 	list_add_tail(&dev->list_all, &list_all_device_instances);
 	return 0;
-
-away_register:
-	device_unregister(&dev->device);
-away:
-	put_device(&dev->device);
-	return rc;
 }
 
 static void
-- 
2.5.0



More information about the devel mailing list