summaryrefslogtreecommitdiffstats
path: root/drivers/clk/samsung/clk-cpu.c
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2017-04-24 08:42:20 +0200
committerSylwester Nawrocki <s.nawrocki@samsung.com>2017-06-07 22:47:57 +0200
commitecb1f1f7311f22917d0571587048cf34d2c8570c (patch)
tree84fed17a3735fa971776076a36877f1d22ebf3f2 /drivers/clk/samsung/clk-cpu.c
parent7288de7451561cb7e9fa0cb0a1c29019807363ad (diff)
downloadlinux-ecb1f1f7311f22917d0571587048cf34d2c8570c.tar.bz2
clk: samsung: Convert common drivers to the new clk_hw API
Clock providers should use the new struct clk_hw based API, so convert Samsung clock providers and their helper functions to the new approach. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Diffstat (limited to 'drivers/clk/samsung/clk-cpu.c')
-rw-r--r--drivers/clk/samsung/clk-cpu.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c
index c6dd83dce09d..6686e8ba61f9 100644
--- a/drivers/clk/samsung/clk-cpu.c
+++ b/drivers/clk/samsung/clk-cpu.c
@@ -411,7 +411,6 @@ int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx,
struct exynos_cpuclk *cpuclk;
struct clk_init_data init;
struct clk *parent_clk;
- struct clk *clk;
int ret = 0;
cpuclk = kzalloc(sizeof(*cpuclk), GFP_KERNEL);
@@ -464,14 +463,13 @@ int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx,
goto unregister_clk_nb;
}
- clk = clk_register(NULL, &cpuclk->hw);
- if (IS_ERR(clk)) {
+ ret = clk_hw_register(NULL, &cpuclk->hw);
+ if (ret) {
pr_err("%s: could not register cpuclk %s\n", __func__, name);
- ret = PTR_ERR(clk);
goto free_cpuclk_data;
}
- samsung_clk_add_lookup(ctx, clk, lookup_id);
+ samsung_clk_add_lookup(ctx, &cpuclk->hw, lookup_id);
return 0;
free_cpuclk_data: