This patch applies against the PM branch. omap_pm_pwrdm_active() and omap_pm_pwrdm_inactive() were dropped from the OMAP PM interface some time ago, but evidently we did not drop them from omap-pm-srf.c; this patch does that now.
Signed-off-by: Paul Walmsley <[email protected]> Cc: Rajendra Nayak <[email protected]> Cc: Kevin Hilman <[email protected]> --- arch/arm/plat-omap/omap-pm-srf.c | 38 +------------------------------------- 1 files changed, 1 insertions(+), 37 deletions(-) diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-pm-srf.c index d769b90..ef1d235 100644 --- a/arch/arm/plat-omap/omap-pm-srf.c +++ b/arch/arm/plat-omap/omap-pm-srf.c @@ -297,43 +297,7 @@ int omap_pm_get_dev_context_loss_count(struct device *dev) } /* - * Powerdomain usecounting hooks - */ - -void omap_pm_pwrdm_active(struct powerdomain *pwrdm) -{ - if (!pwrdm) { - WARN_ON(1); - return; - }; - - pr_debug("OMAP PM: powerdomain %s is becoming active\n", pwrdm->name); - - /* - * CDP code apparently will need these for the enable_power_domain() - * and disable_power_domain() functions. - */ -} - -void omap_pm_pwrdm_inactive(struct powerdomain *pwrdm) -{ - if (!pwrdm) { - WARN_ON(1); - return; - }; - - pr_debug("OMAP PM: powerdomain %s is becoming inactive\n", - pwrdm->name); - - /* - * CDP code apparently will need these for the enable_power_domain() - * and disable_power_domain() functions. - */ -} - -/* - * Should be called before clk framework since clk fw will call - * omap_pm_pwrdm_{in,}active() + * Must be called before clk framework init */ int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table, struct omap_opp *dsp_opp_table, -- 1.6.5.GIT -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
