From: Vivek Gautam Date: Sat, 10 May 2014 12:00:05 +0000 (+0530) Subject: usb: host: ehci-exynos: Use devm_ioremap_resource instead of devm_ioremap X-Git-Tag: MMI-PSA29.97-13-9~11772^2~37^2~155 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4e24bde33fd26af51b2f0c69ec5a5d847f6f26a5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git usb: host: ehci-exynos: Use devm_ioremap_resource instead of devm_ioremap 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 Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index c7081c75de8a..d1c76216350f 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -218,10 +218,9 @@ skip_phy: hcd->rsrc_start = res->start; hcd->rsrc_len = resource_size(res); - hcd->regs = devm_ioremap(&pdev->dev, res->start, hcd->rsrc_len); - if (!hcd->regs) { - dev_err(&pdev->dev, "Failed to remap I/O memory\n"); - err = -ENOMEM; + hcd->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(hcd->regs)) { + err = PTR_ERR(hcd->regs); goto fail_io; }