AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

USB: ehci-octeon: Use devm_ioremap_resource()

Browse Source 
Use devm_ioremap_resource() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jingoo Han 2013-12-11 16:20:06 +09:00 committed by Greg Kroah-Hartman
parent 7667fe69e7
commit 49aa57bda7
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/host/ehci-octeon.c
View File

@ -128,20 +128,12 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
hcd->rsrc_start = res_mem->start; hcd->rsrc_start = res_mem->start;
hcd->rsrc_len = resource_size(res_mem); hcd->rsrc_len = resource_size(res_mem);
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd->regs = devm_ioremap_resource(&pdev->dev, res_mem);
OCTEON_EHCI_HCD_NAME)) { if (IS_ERR(hcd->regs)) {
dev_err(&pdev->dev, "request_mem_region failed\n"); ret = PTR_ERR(hcd->regs);
ret = -EBUSY;
goto err1; goto err1;
} }
hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
if (!hcd->regs) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err2;
}
ehci_octeon_start(); ehci_octeon_start();
ehci = hcd_to_ehci(hcd); ehci = hcd_to_ehci(hcd);
@ -156,19 +148,16 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
ret = usb_add_hcd(hcd, irq, IRQF_SHARED); ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret) { if (ret) {
dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret); dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
goto err3; goto err2;
} }
device_wakeup_enable(hcd->self.controller); device_wakeup_enable(hcd->self.controller);
platform_set_drvdata(pdev, hcd); platform_set_drvdata(pdev, hcd);
return 0; return 0;
err3: err2:
ehci_octeon_stop(); ehci_octeon_stop();
iounmap(hcd->regs);
err2:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err1: err1:
usb_put_hcd(hcd); usb_put_hcd(hcd);
return ret; return ret;
@ -181,8 +170,6 @@ static int ehci_octeon_drv_remove(struct platform_device *pdev)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
ehci_octeon_stop(); ehci_octeon_stop();
iounmap(hcd->regs);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd); usb_put_hcd(hcd);
return 0; return 0;