From: Youngmin Nam <youngmin.nam@samsung.com>
Date: Mon, 24 Aug 2015 10:44:21 +0000 (+0900)
Subject: i2c: s3c2410: Fix compile error
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=482e30d53451f7f297591b2e7b140250aa078715;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

i2c: s3c2410: Fix compile error

Change-Id: I43824c6f1e72aea52da3b6cb8d06e684107a516e
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
---

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index e31b73e63398..5fc56a2048bf 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -40,11 +40,7 @@
 #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;