From 4823cd388dd68015e254d1449bd63ffe47d83fa7 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 15 Mar 2012 08:19:29 +0000 Subject: [PATCH] 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 Cc: Eric Miao Cc: Haojian Zhuang Cc: Samuel Ortiz Signed-off-by: David S. Miller --- drivers/net/irda/pxaficp_ir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 81d5275a15e..ff16daf33ae 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); } -- 2.11.4.GIT