Skip to content

Commit

Permalink
clk: axi-clkgen: Migrate to clk_hw based OF and registration APIs
Browse files Browse the repository at this point in the history
Now that we have clk_hw based provider APIs to register clks, we
can get rid of struct clk pointers while registering clks in
these drivers, allowing us to move closer to a clear split of
consumer and provider clk APIs.

Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  • Loading branch information
Stephen Boyd authored and Stephen Boyd committed Aug 24, 2016
1 parent 78cf555 commit e0d30bb
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/clk/clk-axi-clkgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit e0d30bb

Please sign in to comment.