2013-05-12 18:03:19

by Lars-Peter Clausen

Subject: [PATCH] mfd: jz4740-adc: Use clk_prepare_enable/clk_disable_unprepare

In preparation to switching the jz4740 clk driver to the common clk framework
update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Lars-Peter Clausen <[email protected]>
---
drivers/mfd/jz4740-adc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index e80587f..a16f698 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -86,13 +86,13 @@ static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)
static inline void jz4740_adc_clk_enable(struct jz4740_adc *adc)
{
if (atomic_inc_return(&adc->clk_ref) == 1)
- clk_enable(adc->clk);
+ clk_prepare_enable(adc->clk);
}

static inline void jz4740_adc_clk_disable(struct jz4740_adc *adc)
{
if (atomic_dec_return(&adc->clk_ref) == 0)
- clk_disable(adc->clk);
+ clk_disable_unprepare(adc->clk);
}

static inline void jz4740_adc_set_enabled(struct jz4740_adc *adc, int engine,
--
1.8.2.1

2013-05-16 22:13:57

by Samuel Ortiz

Subject: Re: [PATCH] mfd: jz4740-adc: Use clk_prepare_enable/clk_disable_unprepare

Hi Lars,

On Sun, May 12, 2013 at 08:05:48PM +0200, Lars-Peter Clausen wrote:
> In preparation to switching the jz4740 clk driver to the common clk framework
> update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare.
>
> Signed-off-by: Lars-Peter Clausen <[email protected]>
> ---
> drivers/mfd/jz4740-adc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to my mfd-next tree, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/