summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2013-08-26 02:00:37 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-09-17 06:47:36 +0900
commitd0127f6fc12e311cdd89bb1bd62f36621778d149 (patch)
treea4ea941a85e431a883dfbc09f39b27f4ebabb074 /drivers/usb
parent8d6c742a6833dffde3ab2ab077480e97b130ccd4 (diff)
downloadop-kernel-dev-d0127f6fc12e311cdd89bb1bd62f36621778d149.zip
op-kernel-dev-d0127f6fc12e311cdd89bb1bd62f36621778d149.tar.gz
usb: ohci-s3c2410.c: Use clk_prepare_enable/clk_disable_unprepare
This patch modifies the ohci-s3c2410 driver to prepare and unprepare clocks in addition to enabling and disabling, since it is required by common clock framework. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-s3c2410.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 4919afa..1adff32 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -47,10 +47,10 @@ static void s3c2410_start_hc(struct platform_device *dev, struct usb_hcd *hcd)
dev_dbg(&dev->dev, "s3c2410_start_hc:\n");
- clk_enable(usb_clk);
+ clk_prepare_enable(usb_clk);
mdelay(2); /* let the bus clock stabilise */
- clk_enable(clk);
+ clk_prepare_enable(clk);
if (info != NULL) {
info->hcd = hcd;
@@ -75,8 +75,8 @@ static void s3c2410_stop_hc(struct platform_device *dev)
(info->enable_oc)(info, 0);
}
- clk_disable(clk);
- clk_disable(usb_clk);
+ clk_disable_unprepare(clk);
+ clk_disable_unprepare(usb_clk);
}
/* ohci_s3c2410_hub_status_data
OpenPOWER on IntegriCloud