soc: mediatek: Use GENPD_FLAG_ACTIVE_WAKEUP

Set the newly introduced GENPD_FLAG_ACTIVE_WAKEUP, which allows to
remove the driver's own flag-based callback.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
index e1ce8b1..e570b6a 100644 (file)
--- a/drivers/soc/mediatek/mtk-scpsys.c
+++ b/drivers/soc/mediatek/mtk-scpsys.c
@@ -361,17 +361,6 @@ out:
        return ret;
 }
 
-static bool scpsys_active_wakeup(struct device *dev)
-{
-       struct generic_pm_domain *genpd;
-       struct scp_domain *scpd;
-
-       genpd = pd_to_genpd(dev->pm_domain);
-       scpd = container_of(genpd, struct scp_domain, genpd);
-
-       return scpd->data->active_wakeup;
-}
-
 static void init_clks(struct platform_device *pdev, struct clk **clk)
 {
        int i;
@@ -466,7 +455,8 @@ static struct scp *init_scp(struct platform_device *pdev,
                genpd->name = data->name;
                genpd->power_off = scpsys_power_off;
                genpd->power_on = scpsys_power_on;
-               genpd->dev_ops.active_wakeup = scpsys_active_wakeup;
+               if (scpd->data->active_wakeup)
+                       genpd->flags |= GENPD_FLAG_ACTIVE_WAKEUP;
        }
 
        return scp;