usb: remove use of __devexit_p

[linux-block.git] / drivers / usb / gadget / s3c-hsotg.c

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 0bb617e1dda2e0ecf2a440b6494761338f15004c..9fd6e5fdc35027d7b7b7a245f5bbafbaa565d8ea 100644 (file)
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2197,7 +2197,7 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg)
        /* issue soft reset */
        writel(GRSTCTL_CSftRst, hsotg->regs + GRSTCTL);
 
-       timeout = 1000;
+       timeout = 10000;
        do {
                grstctl = readl(hsotg->regs + GRSTCTL);
        } while ((grstctl & GRSTCTL_CSftRst) && timeout-- > 0);
@@ -2207,7 +2207,7 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg)
                return -EINVAL;
        }
 
-       timeout = 1000;
+       timeout = 10000;
 
        while (1) {
                u32 grstctl = readl(hsotg->regs + GRSTCTL);
@@ -3516,7 +3516,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
        hsotg->dev = dev;
        hsotg->plat = plat;
 
-       hsotg->clk = clk_get(&pdev->dev, "otg");
+       hsotg->clk = devm_clk_get(&pdev->dev, "otg");
        if (IS_ERR(hsotg->clk)) {
                dev_err(dev, "cannot get otg clock\n");
                return PTR_ERR(hsotg->clk);
@@ -3667,7 +3667,6 @@ err_supplies:
 
 err_clk:
        clk_disable_unprepare(hsotg->clk);
-       clk_put(hsotg->clk);
 
        return ret;
 }
@@ -3693,7 +3692,6 @@ static int __devexit s3c_hsotg_remove(struct platform_device *pdev)
        regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
        clk_disable_unprepare(hsotg->clk);
-       clk_put(hsotg->clk);
 
        device_unregister(&hsotg->gadget.dev);
        return 0;
@@ -3710,7 +3708,7 @@ static struct platform_driver s3c_hsotg_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = s3c_hsotg_probe,
-       .remove         = __devexit_p(s3c_hsotg_remove),
+       .remove         = s3c_hsotg_remove,
        .suspend        = s3c_hsotg_suspend,
        .resume         = s3c_hsotg_resume,
 };