Commit d0af45f1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rafael J. Wysocki
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 89c7aea9

drivers/base/power/domain.c

+3 −11
Original line number Diff line number Diff line
@@ -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);

include/linux/pm_domain.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE