i2c: s3c2410: Remove unnecessary label err_noclk
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>
This commit is contained in:
Родитель
876ae85c8b
Коммит
669da30d4c
|
@ -1000,8 +1000,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
|
i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
|
||||||
if (!i2c->pdata) {
|
if (!i2c->pdata) {
|
||||||
ret = -ENOMEM;
|
dev_err(&pdev->dev, "no memory for platform data\n");
|
||||||
goto err_noclk;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
i2c->quirks = s3c24xx_get_device_quirks(pdev);
|
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");
|
i2c->clk = clk_get(&pdev->dev, "i2c");
|
||||||
if (IS_ERR(i2c->clk)) {
|
if (IS_ERR(i2c->clk)) {
|
||||||
dev_err(&pdev->dev, "cannot get clock\n");
|
dev_err(&pdev->dev, "cannot get clock\n");
|
||||||
ret = -ENOENT;
|
return -ENOENT;
|
||||||
goto err_noclk;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
|
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:
|
err_clk:
|
||||||
clk_disable_unprepare(i2c->clk);
|
clk_disable_unprepare(i2c->clk);
|
||||||
clk_put(i2c->clk);
|
clk_put(i2c->clk);
|
||||||
|
|
||||||
err_noclk:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче