diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-01-24 05:11:09 -0500 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2013-01-27 23:26:45 -0500 |
commit | dc6fea4456aeadd3452638668101f269fbb9fd0d (patch) | |
tree | ba2a637e62284d162b72f6ea4f1aea05533cec6a /drivers/i2c | |
parent | d16933b33914a6dff38a4ecbe8edce44a17898e8 (diff) |
i2c: s3c2410: Remove err_cpufreq label
err_cpufreq label is now used only once. It can be removed and related
code can be moved to the caller location.
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 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 4d1ba8d7d347..3479ca76d2ae 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -1109,7 +1109,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
1109 | ret = i2c_add_numbered_adapter(&i2c->adap); | 1109 | ret = i2c_add_numbered_adapter(&i2c->adap); |
1110 | if (ret < 0) { | 1110 | if (ret < 0) { |
1111 | dev_err(&pdev->dev, "failed to add bus to i2c core\n"); | 1111 | dev_err(&pdev->dev, "failed to add bus to i2c core\n"); |
1112 | goto err_cpufreq; | 1112 | s3c24xx_i2c_deregister_cpufreq(i2c); |
1113 | return ret; | ||
1113 | } | 1114 | } |
1114 | 1115 | ||
1115 | of_i2c_register_devices(&i2c->adap); | 1116 | of_i2c_register_devices(&i2c->adap); |
@@ -1120,10 +1121,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) | |||
1120 | 1121 | ||
1121 | dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); | 1122 | dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); |
1122 | return 0; | 1123 | return 0; |
1123 | |||
1124 | err_cpufreq: | ||
1125 | s3c24xx_i2c_deregister_cpufreq(i2c); | ||
1126 | return ret; | ||
1127 | } | 1124 | } |
1128 | 1125 | ||
1129 | /* s3c24xx_i2c_remove | 1126 | /* s3c24xx_i2c_remove |