summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-01-24 11:11:09 +0100
committerWolfram Sang <w.sang@pengutronix.de>2013-01-28 05:26:45 +0100
commitdc6fea4456aeadd3452638668101f269fbb9fd0d (patch)
treeba2a637e62284d162b72f6ea4f1aea05533cec6a /drivers/i2c
parenti2c: s3c2410: Move location of clk_prepare_enable() call in probe function (diff)
downloadlinux-dc6fea4456aeadd3452638668101f269fbb9fd0d.tar.xz
linux-dc6fea4456aeadd3452638668101f269fbb9fd0d.zip
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.c7
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)
ret = i2c_add_numbered_adapter(&i2c->adap);
if (ret < 0) {
dev_err(&pdev->dev, "failed to add bus to i2c core\n");
- goto err_cpufreq;
+ s3c24xx_i2c_deregister_cpufreq(i2c);
+ return ret;
}
of_i2c_register_devices(&i2c->adap);
@@ -1120,10 +1121,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));
return 0;
-
- err_cpufreq:
- s3c24xx_i2c_deregister_cpufreq(i2c);
- return ret;
}
/* s3c24xx_i2c_remove