Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/lst/linux into drm-fixes

[cascardo/linux.git] / drivers / clk / h8300 / clk-h8s2678.c

diff --git a/drivers/clk/h8300/clk-h8s2678.c b/drivers/clk/h8300/clk-h8s2678.c
index c9c2fd5..a263124 100644 (file)
--- a/drivers/clk/h8300/clk-h8s2678.c
+++ b/drivers/clk/h8300/clk-h8s2678.c
@@ -84,11 +84,11 @@ static const struct clk_ops pll_ops = {
 static void __init h8s2678_pll_clk_setup(struct device_node *node)
 {
        unsigned int num_parents;
-       struct clk *clk;
        const char *clk_name = node->name;
        const char *parent_name;
        struct pll_clock *pll_clock;
        struct clk_init_data init;
+       int ret;
 
        num_parents = of_clk_get_parent_count(node);
        if (!num_parents) {
@@ -121,14 +121,14 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node)
        init.num_parents = 1;
        pll_clock->hw.init = &init;
 
-       clk = clk_register(NULL, &pll_clock->hw);
-       if (IS_ERR(clk)) {
-               pr_err("%s: failed to register %s div clock (%ld)\n",
-                      __func__, clk_name, PTR_ERR(clk));
+       ret = clk_hw_register(NULL, &pll_clock->hw);
+       if (ret) {
+               pr_err("%s: failed to register %s div clock (%d)\n",
+                      __func__, clk_name, ret);
                goto unmap_pllcr;
        }
 
-       of_clk_add_provider(node, of_clk_src_simple_get, clk);
+       of_clk_add_hw_provider(node, of_clk_hw_simple_get, &pll_clock->hw);
        return;
 
 unmap_pllcr: