]> Pileus Git - ~andy/linux/commitdiff
i2c: s3c2410: Remove err_cpufreq label
authorTushar Behera <tushar.behera@linaro.org>
Thu, 24 Jan 2013 10:11:09 +0000 (15:41 +0530)
committerWolfram Sang <w.sang@pengutronix.de>
Mon, 28 Jan 2013 04:26:45 +0000 (05:26 +0100)
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>
drivers/i2c/busses/i2c-s3c2410.c

index 4d1ba8d7d347845d8dcecb0c74f54e6c48a3a894..3479ca76d2ae1e488100c293c2cce8c341a390ce 100644 (file)
@@ -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