Commit 1feda3ed authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

drivers/usb/host/ehci-ixp4xx.c: use devm_ functions 



The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses these functions for data that is allocated in
the probe function of a platform device and is only freed in the remove
function.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 436f2719

drivers/usb/host/ehci-ixp4xx.c

+3 −16
Original line number Diff line number Diff line
@@ -98,30 +98,19 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev) 
	hcd->rsrc_start = res->start;

	hcd->rsrc_len = resource_size(res);



	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,

				driver->description)) {

		dev_dbg(&pdev->dev, "controller already in use\n");

		retval = -EBUSY;

		goto fail_request_resource;

	}



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

	hcd->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (hcd->regs == NULL) {

		dev_dbg(&pdev->dev, "error mapping memory\n");

		retval = -EFAULT;

		goto fail_ioremap;

		goto fail_request_resource;

	}



	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (retval)

		goto fail_add_hcd;

		goto fail_request_resource;



	return retval;



fail_add_hcd:

	iounmap(hcd->regs);

fail_ioremap:

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

fail_request_resource:

	usb_put_hcd(hcd);

fail_create_hcd:
@@ -134,8 +123,6 @@ static int ixp4xx_ehci_remove(struct platform_device *pdev) 
	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

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

	usb_put_hcd(hcd);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE