|
@@ -866,14 +866,6 @@ static bool genpd_present(const struct generic_pm_domain *genpd)
|
|
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
|
|
|
|
-static bool genpd_dev_active_wakeup(const struct generic_pm_domain *genpd,
|
|
|
- struct device *dev)
|
|
|
-{
|
|
|
- if (genpd_is_active_wakeup(genpd))
|
|
|
- return true;
|
|
|
- return GENPD_DEV_CALLBACK(genpd, bool, active_wakeup, dev);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* genpd_sync_power_off - Synchronously power off a PM domain and its masters.
|
|
|
* @genpd: PM domain to power off, if possible.
|
|
@@ -978,7 +970,7 @@ static bool resume_needed(struct device *dev,
|
|
|
if (!device_can_wakeup(dev))
|
|
|
return false;
|
|
|
|
|
|
- active_wakeup = genpd_dev_active_wakeup(genpd, dev);
|
|
|
+ active_wakeup = genpd_is_active_wakeup(genpd);
|
|
|
return device_may_wakeup(dev) ? active_wakeup : !active_wakeup;
|
|
|
}
|
|
|
|
|
@@ -1047,7 +1039,7 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff)
|
|
|
if (IS_ERR(genpd))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev))
|
|
|
+ if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
|
|
|
return 0;
|
|
|
|
|
|
if (poweroff)
|
|
@@ -1102,7 +1094,7 @@ static int genpd_resume_noirq(struct device *dev)
|
|
|
if (IS_ERR(genpd))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev))
|
|
|
+ if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
|
|
|
return 0;
|
|
|
|
|
|
genpd_lock(genpd);
|