diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-01-24 05:11:06 -0500 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2013-01-27 23:26:44 -0500 |
commit | 669da30d4c972fe62e14a435abf909d19d9b9467 (patch) | |
tree | 7865d4782b43041d0d768243c9e41432617b3e47 /drivers/i2c | |
parent | 876ae85c8b811668c2c115ea78c2241f562977fb (diff) |
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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index a290d089ceaf..b7ca1f49d548 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -1000,8 +1000,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
1000 | 1000 | ||
1001 | i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); | 1001 | i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); |
1002 | if (!i2c->pdata) { | 1002 | if (!i2c->pdata) { |
1003 | ret = -ENOMEM; | 1003 | dev_err(&pdev->dev, "no memory for platform data\n"); |
1004 | goto err_noclk; | 1004 | return -ENOMEM; |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | i2c->quirks = s3c24xx_get_device_quirks(pdev); | 1007 | i2c->quirks = s3c24xx_get_device_quirks(pdev); |
@@ -1025,8 +1025,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
1025 | i2c->clk = clk_get(&pdev->dev, "i2c"); | 1025 | i2c->clk = clk_get(&pdev->dev, "i2c"); |
1026 | if (IS_ERR(i2c->clk)) { | 1026 | if (IS_ERR(i2c->clk)) { |
1027 | dev_err(&pdev->dev, "cannot get clock\n"); | 1027 | dev_err(&pdev->dev, "cannot get clock\n"); |
1028 | ret = -ENOENT; | 1028 | return -ENOENT; |
1029 | goto err_noclk; | ||
1030 | } | 1029 | } |
1031 | 1030 | ||
1032 | dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk); | 1031 | dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk); |
@@ -1133,8 +1132,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
1133 | err_clk: | 1132 | err_clk: |
1134 | clk_disable_unprepare(i2c->clk); | 1133 | clk_disable_unprepare(i2c->clk); |
1135 | clk_put(i2c->clk); | 1134 | clk_put(i2c->clk); |
1136 | |||
1137 | err_noclk: | ||
1138 | return ret; | 1135 | return ret; |
1139 | } | 1136 | } |
1140 | 1137 | ||