]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk: renesas: cpg-mssr: Drop check for CONFIG_PM_GENERIC_DOMAINS_OF
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 4 Mar 2016 14:36:33 +0000 (15:36 +0100)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 7 Apr 2016 15:27:10 +0000 (17:27 +0200)
As of commit 71d076ceb245f0d9 ("ARM: shmobile: Enable PM and
PM_GENERIC_DOMAINS for SoCs with PM Domains"),
CONFIG_PM_GENERIC_DOMAINS_OF is always enabled for SoCs with a CPG/MSSR
block.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
drivers/clk/renesas/renesas-cpg-mssr.c

index 3e4d2609cc0292b79518473970bf68812a282d7f..703bdb157528eecbf4da10e845117c252e463206 100644 (file)
@@ -381,8 +381,6 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
        kfree(clock);
 }
 
-
-#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
 struct cpg_mssr_clk_domain {
        struct generic_pm_domain genpd;
        struct device_node *np;
@@ -497,15 +495,6 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev,
        of_genpd_add_provider_simple(np, genpd);
        return 0;
 }
-#else
-static inline int cpg_mssr_add_clk_domain(struct device *dev,
-                                         const unsigned int *core_pm_clks,
-                                         unsigned int num_core_pm_clks)
-{
-       return 0;
-}
-#endif /* !CONFIG_PM_GENERIC_DOMAINS_OF */
-
 
 static const struct of_device_id cpg_mssr_match[] = {
 #ifdef CONFIG_ARCH_R8A7795