i2c: s3c2410: Fix compile error
authorYoungmin Nam <youngmin.nam@samsung.com>
Mon, 24 Aug 2015 10:44:21 +0000 (19:44 +0900)
committermyung-su.cha <myung-su.cha@samsung.com>
Thu, 10 May 2018 04:40:53 +0000 (13:40 +0900)
Change-Id: I43824c6f1e72aea52da3b6cb8d06e684107a516e
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/i2c/busses/i2c-s3c2410.c

index e31b73e633989b743aa919f0f287e022d6b5360f..5fc56a2048bfe36d3df2aee23a76694f0be2e400 100644 (file)
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #ifdef CONFIG_CPU_IDLE
-#include <mach/exynos-pm.h>
-#endif
-
-#ifdef CONFIG_CPU_IDLE
-#include <mach/exynos-pm.h>
+#include <soc/samsung/exynos-pm.h>
 static LIST_HEAD(drvdata_list);
 #endif
 
@@ -1326,8 +1322,8 @@ static int s3c24xx_i2c_suspend_noirq(struct device *dev)
 
 static int s3c24xx_i2c_resume_noirq(struct device *dev)
 {
-       struct s3c24xx_i2c *i2c = dev_get_drvdata(dev);
-       int ret;
+       struct platform_device *pdev = to_platform_device(dev);
+       struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
 
        i2c->suspended = 0;
        i2c->need_hw_init = S3C2410_NEED_REG_INIT;