Skip to contentSkip to conversation

mfd: jz4740-adc: Use clk_prepare_enable/clk_disable_unprepare

PATCH Applied Lars-Peter Clausen 2 participants 2 messages May 12, 2013 – May 16, 2013 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/mfd/jz4740-adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/jz4740-adc.c +2 -2
index e80587f..a16f698 100644
@@ -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,
Signature · 1 line
1.8.2.1
Applied
#1 lore raw

Hi Lars,

Quoted 7 lines · Lars-Peter Clausen

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.

---
 drivers/mfd/jz4740-adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to my mfd-next tree, thanks.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/