Skip to contentSkip to conversation

i2o: trivial: cleanup some exit paths

PATCH Applied Dan Carpenter 2 participants 2 messages Apr 23, 2010 – Apr 26, 2010 Kernel janitors

lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 i2o: trivial: cleanup some exit paths

This is just a cleanup and doesn't change how the code works.

The original code had a mix of returns and gotos so I changed everything to just return directly.

Signed-off-by Dan Carpenter <[email protected]>
Reviewed-by Christoph Lameter <[email protected]>

---
There isn't really a maintainer for this code and Alan Cox suggested that I just send it through the trivial tree.

drivers/message/i2o/i2o_config.c +6 -10
index 11073fa..d33693c 100644
@@ -314,22 +314,22 @@ static int i2o_cfg_swul(unsigned long arg)
 	int ret = 0;
 
 	if (copy_from_user(&kxfer, pxfer, sizeof(struct i2o_sw_xfer)))
-		goto return_fault;
+		return -EFAULT;
 
 	if (get_user(swlen, kxfer.swlen) < 0)
-		goto return_fault;
+		return -EFAULT;
 
 	if (get_user(maxfrag, kxfer.maxfrag) < 0)
-		goto return_fault;
+		return -EFAULT;
 
 	if (get_user(curfrag, kxfer.curfrag) < 0)
-		goto return_fault;
+		return -EFAULT;
 
 	if (curfrag = maxfrag)
 		fragsize = swlen - (maxfrag - 1) * 8192;
 
 	if (!kxfer.buf)
-		goto return_fault;
+		return -EFAULT;
 
 	c = i2o_find_iop(kxfer.iop);
 	if (!c)

@@ -373,12 +373,8 @@ static int i2o_cfg_swul(unsigned long arg)
 
 	i2o_dma_free(&c->pdev->dev, &buffer);
 
-      return_ret:
 	return ret;
-      return_fault:
-	ret = -EFAULT;
-	goto return_ret;
-};
+}
 
 static int i2o_cfg_swdel(unsigned long arg)
 {