summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-05-02 04:54:40 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-05-02 04:54:39 -0700
commit2542cb864f22f9ea26f1cd03e9796444152ea40a (patch)
treeabc326a92f6b48089af9db897cf649ca33f2bc3b
parentaab4834f1e05bccb712c8abf6bad3cd4fdb5200c (diff)
parentb7d0257cd687bf29704d154c36c8d86c21332bf4 (diff)
Merge "i2c-msm-v2: Add support for suspend to disk"
-rw-r--r--drivers/i2c/busses/i2c-msm-v2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-msm-v2.c b/drivers/i2c/busses/i2c-msm-v2.c
index c0d962212720..67261bc10e80 100644
--- a/drivers/i2c/busses/i2c-msm-v2.c
+++ b/drivers/i2c/busses/i2c-msm-v2.c
@@ -2848,8 +2848,8 @@ static void i2c_msm_pm_rt_init(struct device *dev) {}
static const struct dev_pm_ops i2c_msm_pm_ops = {
#ifdef CONFIG_PM_SLEEP
- .suspend_noirq = i2c_msm_pm_sys_suspend_noirq,
- .resume_noirq = i2c_msm_pm_sys_resume_noirq,
+ SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(i2c_msm_pm_sys_suspend_noirq,
+ i2c_msm_pm_sys_resume_noirq)
#endif
SET_RUNTIME_PM_OPS(i2c_msm_pm_rt_suspend,
i2c_msm_pm_rt_resume,