summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBoris BREZILLON <b.brezillon@overkiz.com>2013-06-19 13:20:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 16:21:52 -0700
commitcfafb62fb4d21648eb706f3028811b611c60d15e (patch)
tree6c7d13c613ffed90acf1108aeb9dd2616f4a805b /drivers/usb
parent8e82d8d98addfecf83c9d42ca78294a8d16070b9 (diff)
downloadblackbird-op-linux-cfafb62fb4d21648eb706f3028811b611c60d15e.tar.gz
blackbird-op-linux-cfafb62fb4d21648eb706f3028811b611c60d15e.zip
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;
static void atmel_start_clock(void)
{
- clk_enable(iclk);
- clk_enable(fclk);
+ clk_prepare_enable(iclk);
+ clk_prepare_enable(fclk);
clocked = 1;
}
static void atmel_stop_clock(void)
{
- clk_disable(fclk);
- clk_disable(iclk);
+ clk_disable_unprepare(fclk);
+ clk_disable_unprepare(iclk);
clocked = 0;
}
OpenPOWER on IntegriCloud