From b1941de1a330205081b9094d942c9617918aee4f Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 24 Sep 2012 13:38:05 -0700 Subject: [PATCH] --- yaml --- r: 336479 b: refs/heads/master c: 9be9d482bcf5a0a3e0ae131a98573b9e2d358915 h: refs/heads/master i: 336477: 82b08c5ad7ce5dfcf8438ab4f8926b366f8cec7a 336475: ff1268eb782eaee1f031bcb63b5ae36238532507 336471: 32fb9e6be154d58b8753f6bf4791650fad281869 336463: b52ce38a2e19e4c72c7e1194e636e8f259687b65 336447: b79b9f9e10494dacf2399a89bcb288a9ed5c7f2e v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-wm831x.c | 30 +++++++----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/[refs] b/[refs] index c491229c4e0c..525fb3d81393 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46c8773a58010d31f228e148b8b774d94cc9810d +refs/heads/master: 9be9d482bcf5a0a3e0ae131a98573b9e2d358915 diff --git a/trunk/drivers/clk/clk-wm831x.c b/trunk/drivers/clk/clk-wm831x.c index eb1afafca037..db4fbf20ffd7 100644 --- a/trunk/drivers/clk/clk-wm831x.c +++ b/trunk/drivers/clk/clk-wm831x.c @@ -370,43 +370,27 @@ static __devinit int wm831x_clk_probe(struct platform_device *pdev) clkdata->xtal_ena = ret & WM831X_XTAL_ENA; clkdata->xtal_hw.init = &wm831x_xtal_init; - clkdata->xtal = clk_register(&pdev->dev, &clkdata->xtal_hw); + clkdata->xtal = devm_clk_register(&pdev->dev, &clkdata->xtal_hw); if (IS_ERR(clkdata->xtal)) return PTR_ERR(clkdata->xtal); clkdata->fll_hw.init = &wm831x_fll_init; - clkdata->fll = clk_register(&pdev->dev, &clkdata->fll_hw); - if (IS_ERR(clkdata->fll)) { - ret = PTR_ERR(clkdata->fll); - goto err_xtal; - } + clkdata->fll = devm_clk_register(&pdev->dev, &clkdata->fll_hw); + if (IS_ERR(clkdata->fll)) + return PTR_ERR(clkdata->fll); clkdata->clkout_hw.init = &wm831x_clkout_init; - clkdata->clkout = clk_register(&pdev->dev, &clkdata->clkout_hw); - if (IS_ERR(clkdata->clkout)) { - ret = PTR_ERR(clkdata->clkout); - goto err_fll; - } + clkdata->clkout = devm_clk_register(&pdev->dev, &clkdata->clkout_hw); + if (IS_ERR(clkdata->clkout)) + return PTR_ERR(clkdata->clkout); dev_set_drvdata(&pdev->dev, clkdata); return 0; - -err_fll: - clk_unregister(clkdata->fll); -err_xtal: - clk_unregister(clkdata->xtal); - return ret; } static int __devexit wm831x_clk_remove(struct platform_device *pdev) { - struct wm831x_clk *clkdata = dev_get_drvdata(&pdev->dev); - - clk_unregister(clkdata->clkout); - clk_unregister(clkdata->fll); - clk_unregister(clkdata->xtal); - return 0; }