From 09859cf209495f9a1378cc78f7822ded1b686265 Mon Sep 17 00:00:00 2001 From: Youngmin Nam Date: Thu, 13 Apr 2017 01:26:47 +0900 Subject: [PATCH] [COMMON] i2c: s3c2410: Use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS instead of open-coded This patch came from f6903783eba49a2cbb6798b35fcf9d2ce61768b9 in android 4.9 Change-Id: I884ec7e3d58985aa4bb6a7e81539f986ea90b329 Signed-off-by: Youngmin Nam --- drivers/i2c/busses/i2c-s3c2410.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 082418f56150..9c8274c86981 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1359,13 +1359,9 @@ static int s3c24xx_i2c_runtime_resume(struct device *dev) #ifdef CONFIG_PM static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { -#ifdef CONFIG_PM_SLEEP - .suspend_noirq = s3c24xx_i2c_suspend_noirq, - .resume_noirq = s3c24xx_i2c_resume_noirq, -#endif -#ifdef CONFIG_PM + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(s3c24xx_i2c_suspend_noirq, + s3c24xx_i2c_resume_noirq) .runtime_resume = s3c24xx_i2c_runtime_resume, -#endif }; #define S3C24XX_DEV_PM_OPS (&s3c24xx_i2c_dev_pm_ops) -- 2.20.1