Commit 18c2bb1b authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman
Browse files

USB: ehci-omap: Use devm_ioremap_resource() 



Make use of devm_ioremap_resource() and correct comment.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54a41966

drivers/usb/host/ehci-omap.c

+5 −16
Original line number Diff line number Diff line
@@ -216,23 +216,15 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 


	res =  platform_get_resource_byname(pdev,

				IORESOURCE_MEM, "ehci");

	if (!res) {

		dev_err(dev, "UHH EHCI get resource failed\n");

		return -ENODEV;

	}



	regs = ioremap(res->start, resource_size(res));

	if (!regs) {

		dev_err(dev, "UHH EHCI ioremap failed\n");

		return -ENOMEM;

	}

	regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);



	hcd = usb_create_hcd(&ehci_omap_hc_driver, dev,

			dev_name(dev));

	if (!hcd) {

		dev_err(dev, "failed to create hcd with err %d\n", ret);

		ret = -ENOMEM;

		goto err_io;

		dev_err(dev, "Failed to create HCD\n");

		return -ENOMEM;

	}



	hcd->rsrc_start = res->start;
@@ -285,8 +277,6 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 
	pm_runtime_put_sync(dev);

	usb_put_hcd(hcd);



err_io:

	iounmap(regs);

	return ret;

}
@@ -306,7 +296,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev) 


	usb_remove_hcd(hcd);

	disable_put_regulator(dev->platform_data);

	iounmap(hcd->regs);

	usb_put_hcd(hcd);



	pm_runtime_put_sync(dev);