aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBoris BREZILLON <b.brezillon@overkiz.com>2013-06-19 07:20:09 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 19:21:52 -0400
commitcfafb62fb4d21648eb706f3028811b611c60d15e (patch)
tree6c7d13c613ffed90acf1108aeb9dd2616f4a805b /drivers/usb
parent8e82d8d98addfecf83c9d42ca78294a8d16070b9 (diff)
ehci-atmel.c: prepare clk before calling enable
Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to avoid common clk framework warnings. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-atmel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 02f4611faa62..3b645ff46f7b 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -37,15 +37,15 @@ static int clocked;
37 37
38static void atmel_start_clock(void) 38static void atmel_start_clock(void)
39{ 39{
40 clk_enable(iclk); 40 clk_prepare_enable(iclk);
41 clk_enable(fclk); 41 clk_prepare_enable(fclk);
42 clocked = 1; 42 clocked = 1;
43} 43}
44 44
45static void atmel_stop_clock(void) 45static void atmel_stop_clock(void)
46{ 46{
47 clk_disable(fclk); 47 clk_disable_unprepare(fclk);
48 clk_disable(iclk); 48 clk_disable_unprepare(iclk);
49 clocked = 0; 49 clocked = 0;
50} 50}
51 51