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

Commit cca2bbb3 authored by Boris Brezillon's avatar Boris Brezillon Committed by Greg Kroah-Hartman
Browse files

usb: ohci-at91: replace request_mem_region + ioremap by devm_ioremap_resource 



Replace the request_mem_region + ioremap calls by the
devm_ioremap_resource call which does the same things but with device
managed resources.

Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d90b819

drivers/usb/host/ohci-at91.c

+6 −21
Original line number Original line Diff line number Diff line
@@ -154,24 +154,17 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, 
	hcd->rsrc_start = pdev->resource[0].start;

	hcd->rsrc_start = pdev->resource[0].start;

	hcd->rsrc_len = resource_size(&pdev->resource[0]);

	hcd->rsrc_len = resource_size(&pdev->resource[0]);





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

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

		pr_debug("request_mem_region failed\n");

	if (IS_ERR(hcd->regs)) {

		retval = -EBUSY;

		retval = PTR_ERR(hcd->regs);

		goto err1;

		goto err;

	}



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

	if (!hcd->regs) {

		pr_debug("ioremap failed\n");

		retval = -EIO;

		goto err2;

	}

	}





	iclk = clk_get(&pdev->dev, "ohci_clk");

	iclk = clk_get(&pdev->dev, "ohci_clk");

	if (IS_ERR(iclk)) {

	if (IS_ERR(iclk)) {

		dev_err(&pdev->dev, "failed to get ohci_clk\n");

		dev_err(&pdev->dev, "failed to get ohci_clk\n");

		retval = PTR_ERR(iclk);

		retval = PTR_ERR(iclk);

		goto err3;

		goto err;

	}

	}

	fclk = clk_get(&pdev->dev, "uhpck");

	fclk = clk_get(&pdev->dev, "uhpck");

	if (IS_ERR(fclk)) {

	if (IS_ERR(fclk)) {
@@ -217,13 +210,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, 
 err4:

 err4:

	clk_put(iclk);

	clk_put(iclk);





 err3:

 err:

	iounmap(hcd->regs);



 err2:

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



 err1:

	usb_put_hcd(hcd);

	usb_put_hcd(hcd);

	return retval;

	return retval;

}

}
@@ -246,8 +233,6 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd, 
{

{

	usb_remove_hcd(hcd);

	usb_remove_hcd(hcd);

	at91_stop_hc(pdev);

	at91_stop_hc(pdev);

	iounmap(hcd->regs);

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

	usb_put_hcd(hcd);

	usb_put_hcd(hcd);





	if (IS_ENABLED(CONFIG_COMMON_CLK))

	if (IS_ENABLED(CONFIG_COMMON_CLK))