Skip to content

Commit

Permalink
i2o: cleanup some exit paths
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Dan Carpenter authored and Jiri Kosina committed Apr 26, 2010
1 parent a33f322 commit b1ffdc8
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/message/i2o/i2o_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit b1ffdc8

Please sign in to comment.