Re: [PATCH] mfd: tc6393xb: prepare/unprepare clocks

[Lee Jones]

On Thu, 06 Nov 2014, Lee Jones wrote:

> On Thu, 06 Nov 2014, Dmitry Eremin-Solenikov wrote:
> 
> > Change clk_enable/disable() calls to clk_prepare_enable() and
> > clk_disable_unrepapre().
> > 
> > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
> > ---
> >  drivers/mfd/tc6393xb.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> Applied, thanks.

OOI, what kernel version was this patch based on?

> > diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
> > index 48579e5..abcb4eb 100644
> > --- a/drivers/mfd/tc6393xb.c
> > +++ b/drivers/mfd/tc6393xb.c
> > @@ -665,7 +665,7 @@ static int tc6393xb_probe(struct platform_device *dev)
> >  		goto err_ioremap;
> >  	}
> >  
> > -	ret = clk_enable(tc6393xb->clk);
> > +	ret = clk_prepare_enable(tc6393xb->clk);
> >  	if (ret)
> >  		goto err_clk_enable;
> >  
> > @@ -728,7 +728,7 @@ err_gpio_add:
> >  		temp = gpiochip_remove(&tc6393xb->gpio);
> >  	tcpd->disable(dev);
> >  err_enable:
> > -	clk_disable(tc6393xb->clk);
> > +	clk_disable_unprepare(tc6393xb->clk);
> >  err_clk_enable:
> >  	iounmap(tc6393xb->scr);
> >  err_ioremap:
> > @@ -764,7 +764,7 @@ static int tc6393xb_remove(struct platform_device *dev)
> >  	}
> >  
> >  	ret = tcpd->disable(dev);
> > -	clk_disable(tc6393xb->clk);
> > +	clk_disable_unprepare(tc6393xb->clk);
> >  	iounmap(tc6393xb->scr);
> >  	release_resource(&tc6393xb->rscr);
> >  	clk_put(tc6393xb->clk);
> > @@ -792,7 +792,7 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)
> >  			ioread8(tc6393xb->scr + SCR_GPI_BCR(i));
> >  	}
> >  	ret = tcpd->suspend(dev);
> > -	clk_disable(tc6393xb->clk);
> > +	clk_disable_unprepare(tc6393xb->clk);
> >  
> >  	return ret;
> >  }
> > @@ -804,7 +804,7 @@ static int tc6393xb_resume(struct platform_device *dev)
> >  	int ret;
> >  	int i;
> >  
> > -	clk_enable(tc6393xb->clk);
> > +	clk_prepare_enable(tc6393xb->clk);
> >  
> >  	ret = tcpd->resume(dev);
> >  	if (ret)
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/