summaryrefslogtreecommitdiff
path: root/drivers/clk/qcom/clk-regmap.c
diff options
context:
space:
mode:
authorStephen Boyd <stephen.boyd@linaro.org>2016-08-16 15:38:27 -0700
committerStephen Boyd <sboyd@codeaurora.org>2016-08-24 17:37:06 -0700
commit120c1552839036f0fb2c01fffb8d8ce4049b729a (patch)
tree1fa23b29edc0526715179779c13bd81218807ab2 /drivers/clk/qcom/clk-regmap.c
parentcc671d13b6a1d1f6db2093994ff75220ce621234 (diff)
clk: qcom: Migrate to clk_hw based registration and OF APIs
Now that we have clk_hw based provider APIs to register clks, we can get rid of struct clk pointers in this driver, allowing us to move closer to a clear split of consumer and provider clk APIs. Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/qcom/clk-regmap.c')
-rw-r--r--drivers/clk/qcom/clk-regmap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clk/qcom/clk-regmap.c b/drivers/clk/qcom/clk-regmap.c
index a58ba39a900c..1c856d330733 100644
--- 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);