i2c: s3c2410: Remove unnecessary label err_noclk
authorTushar Behera <tushar.behera@linaro.org>
Thu, 24 Jan 2013 10:11:06 +0000 (15:41 +0530)
committerWolfram Sang <w.sang@pengutronix.de>
Mon, 28 Jan 2013 04:26:44 +0000 (05:26 +0100)
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>
drivers/i2c/busses/i2c-s3c2410.c

index a290d089ceaf084702530af3ebce4fe458e9132c..b7ca1f49d548a7ec2ae12c5bd696c7ee3be611df 100644 (file)
@@ -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);
@@ -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);
@@ -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;
 }