Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Julia Lawall 2012-07-29 21:46:05 +02:00 • committed by Greg Kroah-Hartman
parent a816e3113b
commit 9798343132
1 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/usb/host/ehci-atmel.c
View file

@ -150,31 +150,24 @@ static int __devinit ehci_atmel_drv_probe(struct platform_device *pdev)
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->regs = devm_request_and_ioremap(&pdev->dev, res);
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);
if (hcd->regs == NULL) { if (hcd->regs == NULL) {
dev_dbg(&pdev->dev, "error mapping memory\n"); dev_dbg(&pdev->dev, "error mapping memory\n");
retval = -EFAULT; retval = -EFAULT;
goto fail_ioremap; goto fail_request_resource;
} }
iclk = clk_get(&pdev->dev, "ehci_clk"); iclk = devm_clk_get(&pdev->dev, "ehci_clk");
if (IS_ERR(iclk)) { if (IS_ERR(iclk)) {
dev_err(&pdev->dev, "Error getting interface clock\n"); dev_err(&pdev->dev, "Error getting interface clock\n");
retval = -ENOENT; retval = -ENOENT;
goto fail_get_iclk; goto fail_request_resource;
} }
fclk = clk_get(&pdev->dev, "uhpck"); fclk = devm_clk_get(&pdev->dev, "uhpck");
if (IS_ERR(fclk)) { if (IS_ERR(fclk)) {
dev_err(&pdev->dev, "Error getting function clock\n"); dev_err(&pdev->dev, "Error getting function clock\n");
retval = -ENOENT; retval = -ENOENT;
goto fail_get_fclk; goto fail_request_resource;
} }
atmel_start_ehci(pdev); atmel_start_ehci(pdev);
@ -187,13 +180,6 @@ static int __devinit ehci_atmel_drv_probe(struct platform_device *pdev)
fail_add_hcd: fail_add_hcd:
atmel_stop_ehci(pdev); atmel_stop_ehci(pdev);
clk_put(fclk);
fail_get_fclk:
clk_put(iclk);
fail_get_iclk:
iounmap(hcd->regs);
fail_ioremap:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
fail_request_resource: fail_request_resource:
usb_put_hcd(hcd); usb_put_hcd(hcd);
fail_create_hcd: fail_create_hcd:
@ -209,13 +195,9 @@ static int __devexit ehci_atmel_drv_remove(struct platform_device *pdev)
ehci_shutdown(hcd); ehci_shutdown(hcd);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
iounmap(hcd->regs);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd); usb_put_hcd(hcd);
atmel_stop_ehci(pdev); atmel_stop_ehci(pdev);
clk_put(fclk);
clk_put(iclk);
fclk = iclk = NULL; fclk = iclk = NULL;
return 0; return 0;