i2c: s3c2410: remove S3C24XX I2C frequency scaling
authorHyeonkook Kim <hk619.kim@samsung.com>
Wed, 11 Dec 2013 04:26:43 +0000 (13:26 +0900)
committermyung-su.cha <myung-su.cha@samsung.com>
Thu, 10 May 2018 04:40:41 +0000 (13:40 +0900)
Thia patch removes CPU frequency scaling to the S3C24XX I2C driver.
The S3C24XX I2C driver doesn't depends on CPU frequency scaling.

Signed-off-by: Hyeonkook Kim <hk619.kim@samsung.com>
Conflicts:

drivers/i2c/busses/i2c-s3c2410.c

Change-Id: If9fa067fd54ea3da2ec459f99db24002c8b7b3d2

drivers/i2c/busses/i2c-s3c2410.c

index 8a3706a889903bcaa0d732172f463debb7e297fc..9f15b6d220ebe280318874ff977c574da8cefb0c 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/clk.h>
-#include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/of.h>
@@ -1279,13 +1278,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                }
        }
 
-       ret = s3c24xx_i2c_register_cpufreq(i2c);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to register cpufreq notifier\n");
-               clk_unprepare(i2c->clk);
-               return ret;
-       }
-
        /* Note, previous versions of the driver used i2c_add_adapter()
         * to add the bus at any number. We now pass the bus number via
         * the platform data, so if unset it will now default to always
@@ -1303,7 +1295,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
                pm_runtime_disable(&pdev->dev);
-               s3c24xx_i2c_deregister_cpufreq(i2c);
                clk_unprepare(i2c->clk);
                return ret;
        }
@@ -1328,8 +1319,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
        pm_runtime_disable(&i2c->adap.dev);
        pm_runtime_disable(&pdev->dev);
 
-       s3c24xx_i2c_deregister_cpufreq(i2c);
-
        i2c_del_adapter(&i2c->adap);
 
        if (pdev->dev.of_node && IS_ERR(i2c->pctrl))