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

[deliverable/linux.git] / drivers / clk / clk-pwm.c

diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c
index 1630a1f085f70cfeb7983b1329da1166ff6eb8e2..8cb9d117fdbf91dfd6625edeac4b42020413542c 100644 (file)
--- a/drivers/clk/clk-pwm.c
+++ b/drivers/clk/clk-pwm.c
@@ -61,7 +61,6 @@ static int clk_pwm_probe(struct platform_device *pdev)
        struct pwm_device *pwm;
        struct pwm_args pargs;
        const char *clk_name;
-       struct clk *clk;
        int ret;
 
        clk_pwm = devm_kzalloc(&pdev->dev, sizeof(*clk_pwm), GFP_KERNEL);
@@ -107,11 +106,11 @@ static int clk_pwm_probe(struct platform_device *pdev)
 
        clk_pwm->pwm = pwm;
        clk_pwm->hw.init = &init;
-       clk = devm_clk_register(&pdev->dev, &clk_pwm->hw);
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
+       ret = devm_clk_hw_register(&pdev->dev, &clk_pwm->hw);
+       if (ret)
+               return ret;
 
-       return of_clk_add_provider(node, of_clk_src_simple_get, clk);
+       return of_clk_add_hw_provider(node, of_clk_hw_simple_get, &clk_pwm->hw);
 }
 
 static int clk_pwm_remove(struct platform_device *pdev)