Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a5ec98 authored by Vivek Gautam's avatar Vivek Gautam Committed by Greg Kroah-Hartman
Browse files

usb: host: ehci-mv: 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: default avatarVivek Gautam <gautam.vivek@samsung.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70843f62

drivers/usb/host/ehci-mv.c

+6 −10
Original line number Diff line number Diff line
@@ -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;

	}