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

[deliverable/linux.git] / drivers / clk / qcom / clk-regmap.c

diff --git a/drivers/clk/qcom/clk-regmap.c b/drivers/clk/qcom/clk-regmap.c
index a58ba39a900ce78239119125ca8844683d170f02..1c856d330733f160041a695a4aa205430e05a840 100644 (file)
--- a/drivers/clk/qcom/clk-regmap.c
+++ b/drivers/clk/qcom/clk-regmap.c
@@ -101,14 +101,13 @@ EXPORT_SYMBOL_GPL(clk_disable_regmap);
  * clk_regmap struct via this function so that the regmap is initialized
  * and so that the clock is registered with the common clock framework.
  */
-struct clk *devm_clk_register_regmap(struct device *dev,
-                                    struct clk_regmap *rclk)
+int devm_clk_register_regmap(struct device *dev, struct clk_regmap *rclk)
 {
        if (dev && dev_get_regmap(dev, NULL))
                rclk->regmap = dev_get_regmap(dev, NULL);
        else if (dev && dev->parent)
                rclk->regmap = dev_get_regmap(dev->parent, NULL);
 
-       return devm_clk_register(dev, &rclk->hw);
+       return devm_clk_hw_register(dev, &rclk->hw);
 }
 EXPORT_SYMBOL_GPL(devm_clk_register_regmap);