usb: musb: switch over to devm_ioremap_resource()

this will make sure that request_memory_region() will
be called and that we don't need to manually call
iounmap() on ->remove().

Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 36b7a1e16e48841c815481ecb03bd3740aefd6d4..fad8571ed4338fe6168c1126f2926a813cd4df82 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2008,7 +2008,6 @@ static int musb_probe(struct platform_device *pdev)
 {
        struct device   *dev = &pdev->dev;
        int             irq = platform_get_irq_byname(pdev, "mc");
-       int             status;
        struct resource *iomem;
        void __iomem    *base;
 
@@ -2016,24 +2015,17 @@ static int musb_probe(struct platform_device *pdev)
        if (!iomem || irq <= 0)
                return -ENODEV;
 
-       base = ioremap(iomem->start, resource_size(iomem));
-       if (!base) {
-               dev_err(dev, "ioremap failed\n");
-               return -ENOMEM;
-       }
+       base = devm_ioremap_resource(dev, iomem);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
-       status = musb_init_controller(dev, irq, base);
-       if (status < 0)
-               iounmap(base);
-
-       return status;
+       return musb_init_controller(dev, irq, base);
 }
 
 static int musb_remove(struct platform_device *pdev)
 {
        struct device   *dev = &pdev->dev;
        struct musb     *musb = dev_to_musb(dev);
-       void __iomem    *ctrl_base = musb->ctrl_base;
 
        /* this gets called on rmmod.
         *  - Host mode: host may still be active
@@ -2044,7 +2036,6 @@ static int musb_remove(struct platform_device *pdev)
        musb_shutdown(pdev);
 
        musb_free(musb);
-       iounmap(ctrl_base);
        device_init_wakeup(dev, 0);
 #ifndef CONFIG_MUSB_PIO_ONLY
        dma_set_mask(dev, *dev->parent->dma_mask);