mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
clk: wm831x: Migrate to clk_hw based registration APIs
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: Mark Brown <broonie@kernel.org> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
759fa96132
commit
cc671d13b6
@ -24,9 +24,6 @@ struct wm831x_clk {
|
|||||||
struct clk_hw xtal_hw;
|
struct clk_hw xtal_hw;
|
||||||
struct clk_hw fll_hw;
|
struct clk_hw fll_hw;
|
||||||
struct clk_hw clkout_hw;
|
struct clk_hw clkout_hw;
|
||||||
struct clk *xtal;
|
|
||||||
struct clk *fll;
|
|
||||||
struct clk *clkout;
|
|
||||||
bool xtal_ena;
|
bool xtal_ena;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -370,19 +367,19 @@ static int wm831x_clk_probe(struct platform_device *pdev)
|
|||||||
clkdata->xtal_ena = ret & WM831X_XTAL_ENA;
|
clkdata->xtal_ena = ret & WM831X_XTAL_ENA;
|
||||||
|
|
||||||
clkdata->xtal_hw.init = &wm831x_xtal_init;
|
clkdata->xtal_hw.init = &wm831x_xtal_init;
|
||||||
clkdata->xtal = devm_clk_register(&pdev->dev, &clkdata->xtal_hw);
|
ret = devm_clk_hw_register(&pdev->dev, &clkdata->xtal_hw);
|
||||||
if (IS_ERR(clkdata->xtal))
|
if (ret)
|
||||||
return PTR_ERR(clkdata->xtal);
|
return ret;
|
||||||
|
|
||||||
clkdata->fll_hw.init = &wm831x_fll_init;
|
clkdata->fll_hw.init = &wm831x_fll_init;
|
||||||
clkdata->fll = devm_clk_register(&pdev->dev, &clkdata->fll_hw);
|
ret = devm_clk_hw_register(&pdev->dev, &clkdata->fll_hw);
|
||||||
if (IS_ERR(clkdata->fll))
|
if (ret)
|
||||||
return PTR_ERR(clkdata->fll);
|
return ret;
|
||||||
|
|
||||||
clkdata->clkout_hw.init = &wm831x_clkout_init;
|
clkdata->clkout_hw.init = &wm831x_clkout_init;
|
||||||
clkdata->clkout = devm_clk_register(&pdev->dev, &clkdata->clkout_hw);
|
ret = devm_clk_hw_register(&pdev->dev, &clkdata->clkout_hw);
|
||||||
if (IS_ERR(clkdata->clkout))
|
if (ret)
|
||||||
return PTR_ERR(clkdata->clkout);
|
return ret;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, clkdata);
|
platform_set_drvdata(pdev, clkdata);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user