diff options
| author |   Philipp Zabel <philipp.zabel@gmail.com> | 2012-03-15 08:19:29 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-03-16 23:11:14 -0700 |
| commit | 4823cd388dd68015e254d1449bd63ffe47d83fa7 (patch) | |
| tree | 6e027801b3dab713afd5fa8cd76374436e91347c | |
| parent | arp: allow arp processing to honor per interface arp_accept sysctl (diff) | |
| download | linux-dev-4823cd388dd68015e254d1449bd63ffe47d83fa7.tar.xz linux-dev-4823cd388dd68015e254d1449bd63ffe47d83fa7.zip | |
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>
| -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 { 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); } |