evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: ehci-omap: Use devm_ioremap_resource()

Browse source 
Make use of devm_ioremap_resource() and correct comment.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roger Quadros 2013-03-12 12:44:40 +02:00 • committed by Greg Kroah-Hartman
parent 54a419668b
commit 18c2bb1b8c
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/host/ehci-omap.c
View file

@ -216,23 +216,15 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, res = platform_get_resource_byname(pdev,
IORESOURCE_MEM, "ehci"); IORESOURCE_MEM, "ehci");
if (!res) { regs = devm_ioremap_resource(dev, res);
dev_err(dev, "UHH EHCI get resource failed\n"); if (IS_ERR(regs))
return -ENODEV; return PTR_ERR(regs);
}
regs = ioremap(res->start, resource_size(res));
if (!regs) {
dev_err(dev, "UHH EHCI ioremap failed\n");
return -ENOMEM;
}
hcd = usb_create_hcd(&ehci_omap_hc_driver, dev, hcd = usb_create_hcd(&ehci_omap_hc_driver, dev,
dev_name(dev)); dev_name(dev));
if (!hcd) { if (!hcd) {
dev_err(dev, "failed to create hcd with err %d\n", ret); dev_err(dev, "Failed to create HCD\n");
ret = -ENOMEM; return -ENOMEM;
goto err_io;
} }
hcd->rsrc_start = res->start; hcd->rsrc_start = res->start;
@ -285,8 +277,6 @@ err_pm_runtime:
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
usb_put_hcd(hcd); usb_put_hcd(hcd);
err_io:
iounmap(regs);
return ret; return ret;
} }
@ -306,7 +296,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
disable_put_regulator(dev->platform_data); disable_put_regulator(dev->platform_data);
iounmap(hcd->regs);
usb_put_hcd(hcd); usb_put_hcd(hcd);
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);