1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 85b74be202eb..319dcfaa8735 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -85,7 +85,7 @@ static void s5p_setup_vbus_gpio(struct platform_device *pdev)
 
 static u64 ehci_s5p_dma_mask = DMA_BIT_MASK(32);
 
-static int __devinit s5p_ehci_probe(struct platform_device *pdev)
+static int s5p_ehci_probe(struct platform_device *pdev)
 {
         struct s5p_ehci_platdata *pdata;
         struct s5p_ehci_hcd *s5p_ehci;
@@ -136,7 +136,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev)
                 goto fail_clk;
         }
 
-        err = clk_enable(s5p_ehci->clk);
+        err = clk_prepare_enable(s5p_ehci->clk);
         if (err)
                 goto fail_clk;
 
@@ -183,13 +183,13 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev)
         return 0;
 
 fail_io:
-        clk_disable(s5p_ehci->clk);
+        clk_disable_unprepare(s5p_ehci->clk);
 fail_clk:
         usb_put_hcd(hcd);
         return err;
 }
 
-static int __devexit s5p_ehci_remove(struct platform_device *pdev)
+static int s5p_ehci_remove(struct platform_device *pdev)
 {
         struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
         struct s5p_ehci_hcd *s5p_ehci = platform_get_drvdata(pdev);
@@ -200,7 +200,7 @@ static int __devexit s5p_ehci_remove(struct platform_device *pdev)
         if (pdata && pdata->phy_exit)
                 pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
 
-        clk_disable(s5p_ehci->clk);
+        clk_disable_unprepare(s5p_ehci->clk);
 
         usb_put_hcd(hcd);
 
@@ -231,7 +231,7 @@ static int s5p_ehci_suspend(struct device *dev)
         if (pdata && pdata->phy_exit)
                 pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
 
-        clk_disable(s5p_ehci->clk);
+        clk_disable_unprepare(s5p_ehci->clk);
 
         return rc;
 }
@@ -243,7 +243,7 @@ static int s5p_ehci_resume(struct device *dev)
         struct platform_device *pdev = to_platform_device(dev);
         struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
 
-        clk_enable(s5p_ehci->clk);
+        clk_prepare_enable(s5p_ehci->clk);
 
         if (pdata && pdata->phy_init)
                 pdata->phy_init(pdev, S5P_USB_PHY_HOST);
@@ -274,7 +274,7 @@ MODULE_DEVICE_TABLE(of, exynos_ehci_match);
 
 static struct platform_driver s5p_ehci_driver = {
         .probe          = s5p_ehci_probe,
-        .remove         = __devexit_p(s5p_ehci_remove),
+        .remove         = s5p_ehci_remove,
         .shutdown       = s5p_ehci_shutdown,
         .driver = {
                 .name   = "s5p-ehci",