Skip to content

Commit

Permalink
i2c: s3c2410: Remove unnecessary label err_noclk
Browse files Browse the repository at this point in the history
err_noclk label redirects to a simple return statement. Move the
return statement to the caller location and remove the label.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
  • Loading branch information
Tushar Behera authored and Wolfram Sang committed Jan 28, 2013
1 parent 876ae85 commit 669da30
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/i2c/busses/i2c-s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -1000,8 +1000,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)

i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!i2c->pdata) {
ret = -ENOMEM;
goto err_noclk;
dev_err(&pdev->dev, "no memory for platform data\n");
return -ENOMEM;
}

i2c->quirks = s3c24xx_get_device_quirks(pdev);
Expand All @@ -1025,8 +1025,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
i2c->clk = clk_get(&pdev->dev, "i2c");
if (IS_ERR(i2c->clk)) {
dev_err(&pdev->dev, "cannot get clock\n");
ret = -ENOENT;
goto err_noclk;
return -ENOENT;
}

dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
Expand Down Expand Up @@ -1133,8 +1132,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
err_clk:
clk_disable_unprepare(i2c->clk);
clk_put(i2c->clk);

err_noclk:
return ret;
}

Expand Down

0 comments on commit 669da30

Please sign in to comment.