Merge remote-tracking branch 'clk/clk-next'

[deliverable/linux.git] / drivers / clk / clk-axi-clkgen.c

diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c
index 3294db3b4e4e7303903b7a0b10a149b25642b148..5e918e7afaba8d82b2f823c3c07602f8fb68f0d7 100644 (file)
--- a/drivers/clk/clk-axi-clkgen.c
+++ b/drivers/clk/clk-axi-clkgen.c
@@ -392,8 +392,8 @@ static int axi_clkgen_probe(struct platform_device *pdev)
        const char *parent_names[2];
        const char *clk_name;
        struct resource *mem;
-       struct clk *clk;
        unsigned int i;
+       int ret;
 
        if (!pdev->dev.of_node)
                return -ENODEV;
@@ -433,12 +433,12 @@ static int axi_clkgen_probe(struct platform_device *pdev)
        axi_clkgen_mmcm_enable(axi_clkgen, false);
 
        axi_clkgen->clk_hw.init = &init;
-       clk = devm_clk_register(&pdev->dev, &axi_clkgen->clk_hw);
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
+       ret = devm_clk_hw_register(&pdev->dev, &axi_clkgen->clk_hw);
+       if (ret)
+               return ret;
 
-       return of_clk_add_provider(pdev->dev.of_node, of_clk_src_simple_get,
-                                   clk);
+       return of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_simple_get,
+                                     &axi_clkgen->clk_hw);
 }
 
 static int axi_clkgen_remove(struct platform_device *pdev)