1 files changed, 6 insertions, 18 deletions

diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c
index 4c528b2c033a..9051439039a7 100644
--- a/drivers/usb/host/ehci-octeon.c
+++ b/drivers/usb/host/ehci-octeon.c
@@ -128,20 +128,12 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
         hcd->rsrc_start = res_mem->start;
         hcd->rsrc_len = resource_size(res_mem);
 
-        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
-                                OCTEON_EHCI_HCD_NAME)) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                ret = -EBUSY;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res_mem);
+        if (IS_ERR(hcd->regs)) {
+                ret = PTR_ERR(hcd->regs);
                 goto err1;
         }
 
-        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-        if (!hcd->regs) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
-                goto err2;
-        }
-
         ehci_octeon_start();
 
         ehci = hcd_to_ehci(hcd);
@@ -156,18 +148,16 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
         ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (ret) {
                 dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
-                goto err3;
+                goto err2;
         }
+        device_wakeup_enable(hcd->self.controller);
 
         platform_set_drvdata(pdev, hcd);
 
         return 0;
-err3:
+err2:
         ehci_octeon_stop();
 
-        iounmap(hcd->regs);
-err2:
-        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err1:
         usb_put_hcd(hcd);
         return ret;
@@ -180,8 +170,6 @@ static int ehci_octeon_drv_remove(struct platform_device *pdev)
         usb_remove_hcd(hcd);
 
         ehci_octeon_stop();
-        iounmap(hcd->regs);
-        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
 
         return 0;