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

Commit 3e2e714e authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

USB: ohci-ppc-of: Use devm_ioremap_resource() 



Use devm_ioremap_resource() to make cleanup paths simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac8d81f3

drivers/usb/host/ohci-ppc-of.c

+4 −18
Original line number Original line Diff line number Diff line
@@ -115,10 +115,9 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op) 
	hcd->rsrc_start = res.start;

	hcd->rsrc_start = res.start;

	hcd->rsrc_len = resource_size(&res);

	hcd->rsrc_len = resource_size(&res);





	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {

	hcd->regs = devm_ioremap_resource(&op->dev, &res);

		dev_err(&op->dev, "%s: request_mem_region failed\n",

	if (IS_ERR(hcd->regs)) {

			__FILE__);

		rv = PTR_ERR(hcd->regs);

		rv = -EBUSY;

		goto err_rmr;

		goto err_rmr;

	}

	}
@@ -127,14 +126,7 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op) 
		dev_err(&op->dev, "%s: irq_of_parse_and_map failed\n",

		dev_err(&op->dev, "%s: irq_of_parse_and_map failed\n",

			__FILE__);

			__FILE__);

		rv = -EBUSY;

		rv = -EBUSY;

		goto err_irq;

		goto err_rmr;

	}



	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs) {

		dev_err(&op->dev, "%s: ioremap failed\n", __FILE__);

		rv = -ENOMEM;

		goto err_ioremap;

	}

	}





	ohci = hcd_to_ohci(hcd);

	ohci = hcd_to_ohci(hcd);
@@ -178,11 +170,7 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op) 
			pr_debug("%s: cannot get ehci offset from fdt\n", __FILE__);

			pr_debug("%s: cannot get ehci offset from fdt\n", __FILE__);

	}

	}





	iounmap(hcd->regs);

err_ioremap:

	irq_dispose_mapping(irq);

	irq_dispose_mapping(irq);

err_irq:

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

err_rmr:

err_rmr:

 	usb_put_hcd(hcd);

 	usb_put_hcd(hcd);
@@ -197,9 +185,7 @@ static int ohci_hcd_ppc_of_remove(struct platform_device *op) 




	usb_remove_hcd(hcd);

	usb_remove_hcd(hcd);





	iounmap(hcd->regs);

	irq_dispose_mapping(hcd->irq);

	irq_dispose_mapping(hcd->irq);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);





	usb_put_hcd(hcd);

	usb_put_hcd(hcd);