diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-05-12 14:05:48 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-11 13:36:59 -0400 |
commit | 404d5df42a812b81ec87b76cc3d2e492434e9ff7 (patch) | |
tree | fb50eb2eeccbf293d8f15e650b30524f8c176431 /drivers/mfd/jz4740-adc.c | |
parent | c0fa7e104bbae5286f4fcf359f66a536f849c040 (diff) |
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 <lars@metafoo.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/jz4740-adc.c')
-rw-r--r-- | drivers/mfd/jz4740-adc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c index 01e86ce438f1..3c0e8cf6916b 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) | |||
86 | static inline void jz4740_adc_clk_enable(struct jz4740_adc *adc) | 86 | static inline void jz4740_adc_clk_enable(struct jz4740_adc *adc) |
87 | { | 87 | { |
88 | if (atomic_inc_return(&adc->clk_ref) == 1) | 88 | if (atomic_inc_return(&adc->clk_ref) == 1) |
89 | clk_enable(adc->clk); | 89 | clk_prepare_enable(adc->clk); |
90 | } | 90 | } |
91 | 91 | ||
92 | static inline void jz4740_adc_clk_disable(struct jz4740_adc *adc) | 92 | static inline void jz4740_adc_clk_disable(struct jz4740_adc *adc) |
93 | { | 93 | { |
94 | if (atomic_dec_return(&adc->clk_ref) == 0) | 94 | if (atomic_dec_return(&adc->clk_ref) == 0) |
95 | clk_disable(adc->clk); | 95 | clk_disable_unprepare(adc->clk); |
96 | } | 96 | } |
97 | 97 | ||
98 | static inline void jz4740_adc_set_enabled(struct jz4740_adc *adc, int engine, | 98 | static inline void jz4740_adc_set_enabled(struct jz4740_adc *adc, int engine, |