From: Stephen Boyd Date: Wed, 1 Jun 2016 23:15:02 +0000 (-0700) Subject: clk: highbank: Migrate to clk_hw based registration and OF APIs X-Git-Tag: v4.8~349^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e66cc05820a188f16551d1648d33c9ec3de366d;p=platform%2Fkernel%2Flinux-amlogic.git clk: highbank: 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 Acked-by: Rob Herring Signed-off-by: Stephen Boyd --- diff --git a/drivers/clk/clk-highbank.c b/drivers/clk/clk-highbank.c index be3a21a..727ed8e 100644 --- a/drivers/clk/clk-highbank.c +++ b/drivers/clk/clk-highbank.c @@ -275,7 +275,6 @@ static const struct clk_ops periclk_ops = { static __init struct clk *hb_clk_init(struct device_node *node, const struct clk_ops *ops) { u32 reg; - struct clk *clk; struct hb_clk *hb_clk; const char *clk_name = node->name; const char *parent_name; @@ -308,13 +307,13 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk hb_clk->hw.init = &init; - clk = clk_register(NULL, &hb_clk->hw); - if (WARN_ON(IS_ERR(clk))) { + rc = clk_hw_register(NULL, &hb_clk->hw); + if (WARN_ON(rc)) { kfree(hb_clk); return NULL; } - rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); - return clk; + rc = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &hb_clk->hw); + return hb_clk->hw.clk; } static void __init hb_pll_init(struct device_node *node)