usb: host: ehci-mv: Use devm_ioremap_resource instead of devm_ioremap
authorVivek Gautam <gautam.vivek@samsung.com>
Sat, 10 May 2014 12:00:07 +0000 (17:30 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 May 2014 21:52:29 +0000 (14:52 -0700)
Using devm_ioremap_resource() API should actually be preferred over
devm_ioremap(), since the former request the mem region first and then
gives back the ioremap'ed memory pointer.
devm_ioremap_resource() calls request_mem_region(), therby preventing
other drivers to make any overlapping call to the same region.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ehci-mv.c

index bd61612a725146ac24ed1c9ae4499633d58541eb..08147c35f83608aec8d895d981be5b37b7a7c30e 100644 (file)
@@ -176,11 +176,9 @@ static int mv_ehci_probe(struct platform_device *pdev)
                goto err_put_hcd;
        }
 
-       ehci_mv->phy_regs = devm_ioremap(&pdev->dev, r->start,
-                                        resource_size(r));
-       if (!ehci_mv->phy_regs) {
-               dev_err(&pdev->dev, "failed to map phy I/O memory\n");
-               retval = -EFAULT;
+       ehci_mv->phy_regs = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(ehci_mv->phy_regs)) {
+               retval = PTR_ERR(ehci_mv->phy_regs);
                goto err_put_hcd;
        }
 
@@ -191,11 +189,9 @@ static int mv_ehci_probe(struct platform_device *pdev)
                goto err_put_hcd;
        }
 
-       ehci_mv->cap_regs = devm_ioremap(&pdev->dev, r->start,
-                                        resource_size(r));
-       if (ehci_mv->cap_regs == NULL) {
-               dev_err(&pdev->dev, "failed to map I/O memory\n");
-               retval = -EFAULT;
+       ehci_mv->cap_regs = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(ehci_mv->cap_regs)) {
+               retval = PTR_ERR(ehci_mv->cap_regs);
                goto err_put_hcd;
        }