From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753194AbaKLQBf (ORCPT ); Wed, 12 Nov 2014 11:01:35 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:46896 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752620AbaKLQBe (ORCPT ); Wed, 12 Nov 2014 11:01:34 -0500 From: Grygorii Strashko To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , CC: Ulf Hansson , , , , , Grygorii Strashko Subject: [PATCH] PM / Domains: restore calling of .suspend/resume_noirq() callbacks Date: Wed, 12 Nov 2014 18:00:47 +0200 Message-ID: <1415808047-23455-1-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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