usb: ohci-at91: replace request_mem_region + ioremap by devm_ioremap_resource

Replace the request_mem_region + ioremap calls by the
devm_ioremap_resource call which does the same things but with device
managed resources.

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 21 deletions

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 29d2093e3cee..a0153279f36a 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -154,24 +154,17 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
         hcd->rsrc_start = pdev->resource[0].start;
         hcd->rsrc_len = resource_size(&pdev->resource[0]);
 
-        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-                pr_debug("request_mem_region failed\n");
-                retval = -EBUSY;
-                goto err1;
-        }
-
-        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-        if (!hcd->regs) {
-                pr_debug("ioremap failed\n");
-                retval = -EIO;
-                goto err2;
+        hcd->regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(hcd->regs)) {
+                retval = PTR_ERR(hcd->regs);
+                goto err;
         }
 
         iclk = clk_get(&pdev->dev, "ohci_clk");
         if (IS_ERR(iclk)) {
                 dev_err(&pdev->dev, "failed to get ohci_clk\n");
                 retval = PTR_ERR(iclk);
-                goto err3;
+                goto err;
         }
         fclk = clk_get(&pdev->dev, "uhpck");
         if (IS_ERR(fclk)) {
@@ -217,13 +210,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
  err4:
         clk_put(iclk);
 
- err3:
-        iounmap(hcd->regs);
-
- err2:
-        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-
- err1:
+ err:
         usb_put_hcd(hcd);
         return retval;
 }
@@ -246,8 +233,6 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
 {
         usb_remove_hcd(hcd);
         at91_stop_hc(pdev);
-        iounmap(hcd->regs);
-        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
 
         if (IS_ENABLED(CONFIG_COMMON_CLK))