clk: samsung: s3c2410: Use generic helper for handling suspend/resume

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>

diff --git a/drivers/clk/samsung/clk-s3c2410.c b/drivers/clk/samsung/clk-s3c2410.c
index a9c8874..8cb868f 100644 (file)
--- a/drivers/clk/samsung/clk-s3c2410.c
+++ b/drivers/clk/samsung/clk-s3c2410.c
@@ -11,7 +11,6 @@
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/syscore_ops.h>
 
 #include <dt-bindings/clock/s3c2410.h>
 
@@ -40,9 +39,6 @@ enum s3c2410_plls {
 
 static void __iomem *reg_base;
 
-#ifdef CONFIG_PM_SLEEP
-static struct samsung_clk_reg_dump *s3c2410_save;
-
 /*
  * list of controller registers to be saved and restored during a
  * suspend/resume cycle.
@@ -57,42 +53,6 @@ static unsigned long s3c2410_clk_regs[] __initdata = {
        CAMDIVN,
 };
 
-static int s3c2410_clk_suspend(void)
-{
-       samsung_clk_save(reg_base, s3c2410_save,
-                               ARRAY_SIZE(s3c2410_clk_regs));
-
-       return 0;
-}
-
-static void s3c2410_clk_resume(void)
-{
-       samsung_clk_restore(reg_base, s3c2410_save,
-                               ARRAY_SIZE(s3c2410_clk_regs));
-}
-
-static struct syscore_ops s3c2410_clk_syscore_ops = {
-       .suspend = s3c2410_clk_suspend,
-       .resume = s3c2410_clk_resume,
-};
-
-static void __init s3c2410_clk_sleep_init(void)
-{
-       s3c2410_save = samsung_clk_alloc_reg_dump(s3c2410_clk_regs,
-                                               ARRAY_SIZE(s3c2410_clk_regs));
-       if (!s3c2410_save) {
-               pr_warn("%s: failed to allocate sleep save data, no sleep support!\n",
-                       __func__);
-               return;
-       }
-
-       register_syscore_ops(&s3c2410_clk_syscore_ops);
-       return;
-}
-#else
-static void __init s3c2410_clk_sleep_init(void) {}
-#endif
-
 PNAME(fclk_p) = { "mpll", "div_slow" };
 
 static struct samsung_mux_clock s3c2410_common_muxes[] __initdata = {
@@ -461,7 +421,8 @@ void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,
                        ARRAY_SIZE(s3c244x_common_aliases));
        }
 
-       s3c2410_clk_sleep_init();
+       samsung_clk_sleep_init(reg_base, s3c2410_clk_regs,
+                              ARRAY_SIZE(s3c2410_clk_regs));
 
        samsung_clk_of_add_provider(np, ctx);
 }