USB: ehci-w90x900: Use devm_ioremap_resource()

Use devm_ioremap_resource() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index 12c1a563c3f2a79be423a58b2581586a8de23bfb..a9303aff125eff1ba1d35a4fe204caff8c35a393 100644 (file)
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -58,17 +58,12 @@ static int usb_w90x900_probe(const struct hc_driver *driver,
        hcd->rsrc_start = res->start;
        hcd->rsrc_len = resource_size(res);
 
-       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-               retval = -EBUSY;
+       hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(hcd->regs)) {
+               retval = PTR_ERR(hcd->regs);
                goto err2;
        }
 
-       hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-       if (hcd->regs == NULL) {
-               retval = -EFAULT;
-               goto err3;
-       }
-
        ehci = hcd_to_ehci(hcd);
        ehci->caps = hcd->regs;
        ehci->regs = hcd->regs +
@@ -88,18 +83,14 @@ static int usb_w90x900_probe(const struct hc_driver *driver,
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
-               goto err4;
+               goto err2;
 
        retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (retval != 0)
-               goto err4;
+               goto err2;
 
        device_wakeup_enable(hcd->self.controller);
        return retval;
-err4:
-       iounmap(hcd->regs);
-err3:
-       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err2:
        usb_put_hcd(hcd);
 err1:
@@ -110,8 +101,6 @@ static void usb_w90x900_remove(struct usb_hcd *hcd,
                        struct platform_device *pdev)
 {
        usb_remove_hcd(hcd);
-       iounmap(hcd->regs);
-       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
        usb_put_hcd(hcd);
 }