]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
net/irda: add clk_prepare/clk_unprepare to pxaficp_ir
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 15 Mar 2012 08:19:29 +0000 (08:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 17 Mar 2012 06:11:14 +0000 (23:11 -0700)
This patch adds clk_prepare/clk_unprepare calls to the pxaficp_ir
driver by using the helper functions clk_prepare_enable and
clk_disable_unprepare.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/irda/pxaficp_ir.c

index 81d5275a15e298dc11a4208b00ffbbbf4cd1864b..ff16daf33ae130df9f3de215e790e1c997748870 100644 (file)
@@ -128,20 +128,20 @@ struct pxa_irda {
 static inline void pxa_irda_disable_clk(struct pxa_irda *si)
 {
        if (si->cur_clk)
-               clk_disable(si->cur_clk);
+               clk_disable_unprepare(si->cur_clk);
        si->cur_clk = NULL;
 }
 
 static inline void pxa_irda_enable_firclk(struct pxa_irda *si)
 {
        si->cur_clk = si->fir_clk;
-       clk_enable(si->fir_clk);
+       clk_prepare_enable(si->fir_clk);
 }
 
 static inline void pxa_irda_enable_sirclk(struct pxa_irda *si)
 {
        si->cur_clk = si->sir_clk;
-       clk_enable(si->sir_clk);
+       clk_prepare_enable(si->sir_clk);
 }