diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2012-03-15 04:19:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-17 02:11:14 -0400 |
commit | 4823cd388dd68015e254d1449bd63ffe47d83fa7 (patch) | |
tree | 6e027801b3dab713afd5fa8cd76374436e91347c /drivers/net/irda/pxaficp_ir.c | |
parent | 124d37e9f088a8f56494b0264d63d22555f53fef (diff) |
net/irda: add clk_prepare/clk_unprepare to pxaficp_ir
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>
Diffstat (limited to 'drivers/net/irda/pxaficp_ir.c')
-rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 81d5275a15e2..ff16daf33ae1 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
@@ -128,20 +128,20 @@ struct pxa_irda { | |||
128 | static inline void pxa_irda_disable_clk(struct pxa_irda *si) | 128 | static inline void pxa_irda_disable_clk(struct pxa_irda *si) |
129 | { | 129 | { |
130 | if (si->cur_clk) | 130 | if (si->cur_clk) |
131 | clk_disable(si->cur_clk); | 131 | clk_disable_unprepare(si->cur_clk); |
132 | si->cur_clk = NULL; | 132 | si->cur_clk = NULL; |
133 | } | 133 | } |
134 | 134 | ||
135 | static inline void pxa_irda_enable_firclk(struct pxa_irda *si) | 135 | static inline void pxa_irda_enable_firclk(struct pxa_irda *si) |
136 | { | 136 | { |
137 | si->cur_clk = si->fir_clk; | 137 | si->cur_clk = si->fir_clk; |
138 | clk_enable(si->fir_clk); | 138 | clk_prepare_enable(si->fir_clk); |
139 | } | 139 | } |
140 | 140 | ||
141 | static inline void pxa_irda_enable_sirclk(struct pxa_irda *si) | 141 | static inline void pxa_irda_enable_sirclk(struct pxa_irda *si) |
142 | { | 142 | { |
143 | si->cur_clk = si->sir_clk; | 143 | si->cur_clk = si->sir_clk; |
144 | clk_enable(si->sir_clk); | 144 | clk_prepare_enable(si->sir_clk); |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||