On Thu, Sep 06, 2012 at 01:48:59PM -0300, Fabio Estevam wrote:
> With the new i.mx clock framework the mxc_w1 clock is registered as:
>
> clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"
>
> So we do not need to pass "owire" string and can use NULL instead.
>
> While at it, also fix the clock error handling code.
>
> Signed-off-by: Fabio Estevam <fabio.este...@freescale.com>
Acked-by: Sascha Hauer <s.ha...@pengutronix.de>
SAscha
> -----
> Changes since v1:
> - Fix clock error handling
> drivers/w1/masters/mxc_w1.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
> index 1cc61a7..960b362 100644
> --- a/drivers/w1/masters/mxc_w1.c
> +++ b/drivers/w1/masters/mxc_w1.c
> @@ -117,11 +117,11 @@ static int __devinit mxc_w1_probe(struct
> platform_device *pdev)
> if (!mdev)
> return -ENOMEM;
>
> - mdev->clk = clk_get(&pdev->dev, "owire");
> - if (!mdev->clk) {
> - err = -ENODEV;
> - goto failed_clk;
> - }
> + mdev->clk = clk_get(&pdev->dev, NULL);
> + if (IS_ERR(mdev->clk)) {
> + err = PTR_ERR(mdev->clk);
> + goto failed_clk;
> + }
>
> mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
>
> --
> 1.7.9.5
>
>
>
--
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/
