Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: samsung: Drop old suspend/resume code

Since all SoC drivers have been moved to local suspend/resume handling,
the old code can be safely dropped.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Thomas Abraham <thomas.ab@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

authored by

Tomasz Figa and committed by
Kukjin Kim
3efb2511 08c0d829

+7 -61
+1 -1
drivers/clk/samsung/clk-exynos4.c
··· 1122 1122 if (!reg_base) 1123 1123 panic("%s: failed to map registers\n", __func__); 1124 1124 1125 - samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0); 1125 + samsung_clk_init(np, reg_base, CLK_NR_CLKS); 1126 1126 1127 1127 samsung_clk_of_register_fixed_ext(exynos4_fixed_rate_ext_clks, 1128 1128 ARRAY_SIZE(exynos4_fixed_rate_ext_clks),
+1 -1
drivers/clk/samsung/clk-exynos5250.c
··· 694 694 panic("%s: unable to determine soc\n", __func__); 695 695 } 696 696 697 - samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0); 697 + samsung_clk_init(np, reg_base, CLK_NR_CLKS); 698 698 samsung_clk_of_register_fixed_ext(exynos5250_fixed_rate_ext_clks, 699 699 ARRAY_SIZE(exynos5250_fixed_rate_ext_clks), 700 700 ext_clk_match);
+1 -1
drivers/clk/samsung/clk-exynos5420.c
··· 786 786 panic("%s: unable to determine soc\n", __func__); 787 787 } 788 788 789 - samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0); 789 + samsung_clk_init(np, reg_base, CLK_NR_CLKS); 790 790 samsung_clk_of_register_fixed_ext(exynos5420_fixed_rate_ext_clks, 791 791 ARRAY_SIZE(exynos5420_fixed_rate_ext_clks), 792 792 ext_clk_match);
+1 -1
drivers/clk/samsung/clk-exynos5440.c
··· 101 101 return; 102 102 } 103 103 104 - samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0); 104 + samsung_clk_init(np, reg_base, CLK_NR_CLKS); 105 105 samsung_clk_of_register_fixed_ext(exynos5440_fixed_rate_ext_clks, 106 106 ARRAY_SIZE(exynos5440_fixed_rate_ext_clks), ext_clk_match); 107 107
+1 -1
drivers/clk/samsung/clk-s3c64xx.c
··· 465 465 panic("%s: failed to map registers\n", __func__); 466 466 } 467 467 468 - samsung_clk_init(np, reg_base, NR_CLKS, NULL, 0, NULL, 0); 468 + samsung_clk_init(np, reg_base, NR_CLKS); 469 469 470 470 /* Register external clocks. */ 471 471 if (!np)
+1 -53
drivers/clk/samsung/clk.c
··· 21 21 static struct clk_onecell_data clk_data; 22 22 #endif 23 23 24 - #ifdef CONFIG_PM_SLEEP 25 24 void samsung_clk_save(void __iomem *base, 26 25 struct samsung_clk_reg_dump *rd, 27 26 unsigned int num_regs) ··· 54 55 return rd; 55 56 } 56 57 57 - static struct samsung_clk_reg_dump *reg_dump; 58 - static unsigned long nr_reg_dump; 59 - 60 - static int samsung_clk_suspend(void) 61 - { 62 - struct samsung_clk_reg_dump *rd = reg_dump; 63 - unsigned long i; 64 - 65 - for (i = 0; i < nr_reg_dump; i++, rd++) 66 - rd->value = __raw_readl(reg_base + rd->offset); 67 - 68 - return 0; 69 - } 70 - 71 - static void samsung_clk_resume(void) 72 - { 73 - struct samsung_clk_reg_dump *rd = reg_dump; 74 - unsigned long i; 75 - 76 - for (i = 0; i < nr_reg_dump; i++, rd++) 77 - __raw_writel(rd->value, reg_base + rd->offset); 78 - } 79 - 80 - static struct syscore_ops samsung_clk_syscore_ops = { 81 - .suspend = samsung_clk_suspend, 82 - .resume = samsung_clk_resume, 83 - }; 84 - #endif /* CONFIG_PM_SLEEP */ 85 - 86 58 /* setup the essentials required to support clock lookup using ccf */ 87 59 void __init samsung_clk_init(struct device_node *np, void __iomem *base, 88 - unsigned long nr_clks, unsigned long *rdump, 89 - unsigned long nr_rdump, unsigned long *soc_rdump, 90 - unsigned long nr_soc_rdump) 60 + unsigned long nr_clks) 91 61 { 92 62 reg_base = base; 93 - 94 - #ifdef CONFIG_PM_SLEEP 95 - if (rdump && nr_rdump) { 96 - unsigned int idx; 97 - reg_dump = kzalloc(sizeof(struct samsung_clk_reg_dump) 98 - * (nr_rdump + nr_soc_rdump), GFP_KERNEL); 99 - if (!reg_dump) { 100 - pr_err("%s: memory alloc for register dump failed\n", 101 - __func__); 102 - return; 103 - } 104 - 105 - for (idx = 0; idx < nr_rdump; idx++) 106 - reg_dump[idx].offset = rdump[idx]; 107 - for (idx = 0; idx < nr_soc_rdump; idx++) 108 - reg_dump[nr_rdump + idx].offset = soc_rdump[idx]; 109 - nr_reg_dump = nr_rdump + nr_soc_rdump; 110 - register_syscore_ops(&samsung_clk_syscore_ops); 111 - } 112 - #endif 113 63 114 64 clk_table = kzalloc(sizeof(struct clk *) * nr_clks, GFP_KERNEL); 115 65 if (!clk_table)
+1 -3
drivers/clk/samsung/clk.h
··· 313 313 _lock, _con, _rtable, _alias) 314 314 315 315 extern void __init samsung_clk_init(struct device_node *np, void __iomem *base, 316 - unsigned long nr_clks, unsigned long *rdump, 317 - unsigned long nr_rdump, unsigned long *soc_rdump, 318 - unsigned long nr_soc_rdump); 316 + unsigned long nr_clks); 319 317 extern void __init samsung_clk_of_register_fixed_ext( 320 318 struct samsung_fixed_rate_clock *fixed_rate_clk, 321 319 unsigned int nr_fixed_rate_clk,