[patch] i2o: cleanup exit paths

[patch] i2o: cleanup exit paths

[Dan Carpenter]

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 <error27@gmail.com>

diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 11073fa..d33693c 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -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)
 {

Re: [patch] i2o: cleanup exit paths

[Christoph Lameter]

Reviewed-by: Christoph Lameter <cl@linux-foundation.org>

Re: [patch] i2o: cleanup exit paths

[Alan Cox]

On Mon, 19 Apr 2010 12:32:09 -0500 (CDT)
Christoph Lameter <cl@linux-foundation.org> wrote:

> 
> Reviewed-by: Christoph Lameter <cl@linux-foundation.org>

Not sure I am the person to Cc. I've got no I2O hardware nor touched it
for a while. It looks sane to me but is un-owned really so I'd send it
either directly or via the trivial patch maintainer .

Re: [patch] i2o: cleanup exit paths

[Christoph Lameter]

On Mon, 19 Apr 2010, Alan Cox wrote:

> Not sure I am the person to Cc. I've got no I2O hardware nor touched it
> for a while. It looks sane to me but is un-owned really so I'd send it
> either directly or via the trivial patch maintainer .

I guess he just randomly picked a couple of kernel developers.

Re: [patch] i2o: cleanup exit paths

[Dan Carpenter]

On Mon, Apr 19, 2010 at 02:47:38PM -0500, Christoph Lameter wrote:
> On Mon, 19 Apr 2010, Alan Cox wrote:
> 
> > Not sure I am the person to Cc. I've got no I2O hardware nor touched it
> > for a while. It looks sane to me but is un-owned really so I'd send it
> > either directly or via the trivial patch maintainer .
> 
> I guess he just randomly picked a couple of kernel developers.

./scripts/get_maintainer.pl

So...  Christoph, I did notice that I've been CC'ing you a lot recently, 
but I figured you had got a promotion or something.  I'll remove you
from the CC list from here out.  Probably you should have refused to ack 
Tejun's slab.h patch. The get_maintainer.pl script now thinks you two own 
97% of the kernel...

Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>

regards,
dan carpenter

Re: [patch] i2o: cleanup exit paths

[Christoph Lameter]

On Tue, 20 Apr 2010, Dan Carpenter wrote:

> So...  Christoph, I did notice that I've been CC'ing you a lot recently,
> but I figured you had got a promotion or something.  I'll remove you
> from the CC list from here out.  Probably you should have refused to ack
> Tejun's slab.h patch. The get_maintainer.pl script now thinks you two own
> 97% of the kernel...

Hehe. I finally made it.