clk: samsung: exynos5250: Use generic helper for handling suspend/resume
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 6 Sep 2018 15:55:29 +0000 (17:55 +0200)
committerSylwester Nawrocki <snawrocki@kernel.org>
Fri, 5 Oct 2018 11:36:30 +0000 (13:36 +0200)
Replace common suspend/resume handling code by generic helper.
Almost no functional change, the only difference is in handling
of hypothetical memory allocation failure on boot.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sylwester Nawrocki <snawrocki@kernel.org>
drivers/clk/samsung/clk-exynos5250.c

index 347fd80..f14139b 100644 (file)
@@ -14,7 +14,6 @@
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/syscore_ops.h>
 
 #include "clk.h"
 #include "clk-cpu.h"
@@ -111,9 +110,6 @@ enum exynos5250_plls {
 
 static void __iomem *reg_base;
 
-#ifdef CONFIG_PM_SLEEP
-static struct samsung_clk_reg_dump *exynos5250_save;
-
 /*
  * list of controller registers to be saved and restored during a
  * suspend/resume cycle.
@@ -172,41 +168,6 @@ static const unsigned long exynos5250_clk_regs[] __initconst = {
        GATE_IP_ISP1,
 };
 
-static int exynos5250_clk_suspend(void)
-{
-       samsung_clk_save(reg_base, exynos5250_save,
-                               ARRAY_SIZE(exynos5250_clk_regs));
-
-       return 0;
-}
-
-static void exynos5250_clk_resume(void)
-{
-       samsung_clk_restore(reg_base, exynos5250_save,
-                               ARRAY_SIZE(exynos5250_clk_regs));
-}
-
-static struct syscore_ops exynos5250_clk_syscore_ops = {
-       .suspend = exynos5250_clk_suspend,
-       .resume = exynos5250_clk_resume,
-};
-
-static void __init exynos5250_clk_sleep_init(void)
-{
-       exynos5250_save = samsung_clk_alloc_reg_dump(exynos5250_clk_regs,
-                                       ARRAY_SIZE(exynos5250_clk_regs));
-       if (!exynos5250_save) {
-               pr_warn("%s: failed to allocate sleep save data, no sleep support!\n",
-                       __func__);
-               return;
-       }
-
-       register_syscore_ops(&exynos5250_clk_syscore_ops);
-}
-#else
-static void __init exynos5250_clk_sleep_init(void) {}
-#endif
-
 /* list of all parent clock list */
 PNAME(mout_apll_p)     = { "fin_pll", "fout_apll", };
 PNAME(mout_cpu_p)      = { "mout_apll", "mout_mpll", };
@@ -882,7 +843,8 @@ static void __init exynos5250_clk_init(struct device_node *np)
                PWR_CTRL2_CORE2_UP_RATIO | PWR_CTRL2_CORE1_UP_RATIO);
        __raw_writel(tmp, reg_base + PWR_CTRL2);
 
-       exynos5250_clk_sleep_init();
+       samsung_clk_sleep_init(reg_base, exynos5250_clk_regs,
+                              ARRAY_SIZE(exynos5250_clk_regs));
        exynos5_subcmus_init(ctx, 1, &exynos5250_disp_subcmu);
 
        samsung_clk_of_add_provider(np, ctx);