TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM / Domains: Remove gpd_dev_ops.active_wakeup() callback

Browse Source 
There are no more users left of the gpd_dev_ops.active_wakeup()
callback.  All have been converted to GENPD_FLAG_ACTIVE_WAKEUP.
Hence remove the callback.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Geert Uytterhoeven
2017-11-07 13:48:15 +01:00
committed by Rafael J. Wysocki
parent 89c7aea915
commit d0af45f1f6
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/base/power/domain.c
View File

@@ -866,14 +866,6 @@ static bool genpd_present(const struct generic_pm_domain *genpd)
#ifdef CONFIG_PM_SLEEP #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_sync_power_off - Synchronously power off a PM domain and its masters.
* @genpd: PM domain to power off, if possible. * @genpd: PM domain to power off, if possible.
@@ -978,7 +970,7 @@ static bool resume_needed(struct device *dev,
if (!device_can_wakeup(dev)) if (!device_can_wakeup(dev))
return false; 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; 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)) if (IS_ERR(genpd))
return -EINVAL; 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; return 0;
if (poweroff) if (poweroff)
@@ -1102,7 +1094,7 @@ static int genpd_resume_noirq(struct device *dev)
if (IS_ERR(genpd)) if (IS_ERR(genpd))
return -EINVAL; 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; return 0;
genpd_lock(genpd); genpd_lock(genpd);

1
include/linux/pm_domain.h
View File

@@ -36,7 +36,6 @@ struct dev_power_governor {
struct gpd_dev_ops { struct gpd_dev_ops {
int (*start)(struct device *dev); int (*start)(struct device *dev);
int (*stop)(struct device *dev); int (*stop)(struct device *dev);
bool (*active_wakeup)(struct device *dev);
}; };
struct genpd_power_state { struct genpd_power_state {