Commit 84b79838 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

drivers/usb/host/ehci-ls1x.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 1feda3ed

drivers/usb/host/ehci-ls1x.c

+3 −15
Original line number Diff line number Diff line
@@ -106,29 +106,19 @@ static int ehci_hcd_ls1x_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, hcd_name)) {

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

		ret = -EBUSY;

		goto err_put_hcd;

	}



	hcd->regs = ioremap(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");

		ret = -EFAULT;

		goto err_release_region;

		goto err_put_hcd;

	}



	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);

	if (ret)

		goto err_iounmap;

		goto err_put_hcd;



	return ret;



err_iounmap:

	iounmap(hcd->regs);

err_release_region:

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

err_put_hcd:

	usb_put_hcd(hcd);

	return ret;
@@ -139,8 +129,6 @@ static int ehci_hcd_ls1x_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