[PATCH] PM / Domains: restore calling of .suspend/resume_noirq() callbacks

[Grygorii Strashko <grygorii.strashko@ti.com>]

Now .suspend/resume_noirq() callbacks will not be called during
system wide suspend/resume for devices which belongs to some GPD.
It seems, that this change was accidently introduced by
commit d23b9b00cdde ("PM / Domains: Rework system suspend callback
 routines (v2)").

This patch restores calling of .suspend/resume_noirq() callbacks
for devices from GPD during system wide suspend/resume.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
 drivers/base/power/domain.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index fb83d4a..f8c70e6 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1014,6 +1014,7 @@ static int pm_genpd_suspend_late(struct device *dev)
 static int pm_genpd_suspend_noirq(struct device *dev)
 {
 	struct generic_pm_domain *genpd;
+	int ret;
 
 	dev_dbg(dev, "%s()\n", __func__);
 
@@ -1021,8 +1022,14 @@ static int pm_genpd_suspend_noirq(struct device *dev)
 	if (IS_ERR(genpd))
 		return -EINVAL;
 
-	if (genpd->suspend_power_off
-	    || (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev)))
+	if (genpd->suspend_power_off)
+		return 0;
+
+	ret = pm_generic_suspend_noirq(dev);
+	if (ret)
+		return ret;
+
+	if (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev))
 		return 0;
 
 	genpd_stop_dev(genpd, dev);
@@ -1065,8 +1072,9 @@ static int pm_genpd_resume_noirq(struct device *dev)
 	 */
 	pm_genpd_sync_poweron(genpd);
 	genpd->suspended_count--;
+	genpd_start_dev(genpd, dev);
 
-	return genpd_start_dev(genpd, dev);
+	return pm_generic_resume_noirq(dev);
 }
 
 /**
-- 
1.9.1