On Fri, Jul 27, 2012 at 01:47:51PM -0300, Fabio Estevam wrote: > Adapt clocks to the new i.mx clock framework and fix the following warning: > > Cc: Theodore Ts'o <ty...@mit.edu> > Cc: Herbert Xu <herb...@gondor.apana.org.au> > Cc: <linux-kernel@vger.kernel.org> > Signed-off-by: Fabio Estevam <fabio.este...@freescale.com>
Both: Acked-by: Sascha Hauer <s.ha...@pengutronix.de> Sascha > --- > Changes since v1: > - Converted a missing 'clk_disable' to 'clk_disable_unprepare' > > drivers/char/hw_random/mxc-rnga.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/char/hw_random/mxc-rnga.c > b/drivers/char/hw_random/mxc-rnga.c > index 85074de..62c7efe 100644 > --- a/drivers/char/hw_random/mxc-rnga.c > +++ b/drivers/char/hw_random/mxc-rnga.c > @@ -152,14 +152,14 @@ static int __init mxc_rnga_probe(struct platform_device > *pdev) > if (rng_dev) > return -EBUSY; > > - clk = clk_get(&pdev->dev, "rng"); > + clk = clk_get(&pdev->dev, NULL); > if (IS_ERR(clk)) { > dev_err(&pdev->dev, "Could not get rng_clk!\n"); > err = PTR_ERR(clk); > goto out; > } > > - clk_enable(clk); > + clk_prepare_enable(clk); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!res) { > @@ -201,7 +201,7 @@ err_ioremap: > release_mem_region(res->start, resource_size(res)); > > err_region: > - clk_disable(clk); > + clk_disable_unprepare(clk); > clk_put(clk); > > out: > @@ -212,7 +212,7 @@ static int __exit mxc_rnga_remove(struct platform_device > *pdev) > { > struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > void __iomem *rng_base = (void __iomem *)mxc_rnga.priv; > - struct clk *clk = clk_get(&pdev->dev, "rng"); > + struct clk *clk = clk_get(&pdev->dev, NULL); > > hwrng_unregister(&mxc_rnga); > > @@ -220,7 +220,7 @@ static int __exit mxc_rnga_remove(struct platform_device > *pdev) > > release_mem_region(res->start, resource_size(res)); > > - clk_disable(clk); > + clk_disable_unprepare(clk); > clk_put(clk); > > return 0; > -- > 1.7.1 > > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/