Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'

[sfrench/cifs-2.6.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index b8e4b966c74dc393b473da4f0074b802b8add5f8..7f374233b4980ee5d551670d7004896a8b7c1ef3 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend)
 {
        struct generic_pm_domain *genpd;
 
-       genpd = genpd_lookup_dev(dev);
-       if (!genpd)
+       genpd = dev_to_genpd(dev);
+       if (!pm_genpd_present(genpd))
                return;
 
        if (suspend) {
@@ -1180,6 +1180,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);
 #define pm_genpd_resume_noirq          NULL
 #define pm_genpd_freeze_noirq          NULL
 #define pm_genpd_thaw_noirq            NULL
+#define pm_genpd_poweroff_noirq                NULL
 #define pm_genpd_restore_noirq         NULL
 #define pm_genpd_complete              NULL