| From de1b4d5b82804ef1f8f2eb74e25bc8004a6a7c67 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Tue, 7 Nov 2017 13:48:15 +0100 |
| Subject: [PATCH 0407/1795] PM / Domains: Remove gpd_dev_ops.active_wakeup() |
| callback |
| |
| 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> |
| (cherry picked from commit d0af45f1f6528949e05385976eb61c5ebd31854e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/base/power/domain.c | 14 +++----------- |
| include/linux/pm_domain.h | 1 - |
| 2 files changed, 3 insertions(+), 12 deletions(-) |
| |
| diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c |
| index 5d63c34e0420..104f3d928b13 100644 |
| --- a/drivers/base/power/domain.c |
| +++ b/drivers/base/power/domain.c |
| @@ -772,14 +772,6 @@ static bool pm_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. |
| @@ -884,7 +876,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; |
| } |
| |
| @@ -954,7 +946,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) |
| @@ -1009,7 +1001,7 @@ static int pm_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); |
| diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h |
| index a6688efb29ee..fe23bf0bd985 100644 |
| --- a/include/linux/pm_domain.h |
| +++ b/include/linux/pm_domain.h |
| @@ -36,7 +36,6 @@ struct dev_power_governor { |
| struct gpd_dev_ops { |
| int (*start)(struct device *dev); |
| int (*stop)(struct device *dev); |
| - bool (*active_wakeup)(struct device *dev); |
| }; |
| |
| struct genpd_power_state { |
| -- |
| 2.19.0 |
| |