hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/usb/host/ehci-xilinx-of.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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Julia Lawall 2012-07-30 16:43:39 +02:00 committed by Greg Kroah-Hartman
parent f1d4eb788a
commit 6df471ea04
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/host/ehci-xilinx-of.c
View File

@ -152,12 +152,6 @@ static int __devinit ehci_hcd_xilinx_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)) {
printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
rv = -EBUSY;
goto err_rmr;
}
irq = irq_of_parse_and_map(dn, 0); irq = irq_of_parse_and_map(dn, 0);
if (!irq) { if (!irq) {
printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__); printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__);
@ -165,11 +159,11 @@ static int __devinit ehci_hcd_xilinx_of_probe(struct platform_device *op)
goto err_irq; goto err_irq;
} }
hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); hcd->regs = devm_request_and_ioremap(&op->dev, &res);
if (!hcd->regs) { if (!hcd->regs) {
printk(KERN_ERR "%s: ioremap failed\n", __FILE__); pr_err("%s: devm_request_and_ioremap failed\n", __FILE__);
rv = -ENOMEM; rv = -ENOMEM;
goto err_ioremap; goto err_irq;
} }
ehci = hcd_to_ehci(hcd); ehci = hcd_to_ehci(hcd);
@ -200,12 +194,7 @@ static int __devinit ehci_hcd_xilinx_of_probe(struct platform_device *op)
if (rv == 0) if (rv == 0)
return 0; return 0;
iounmap(hcd->regs);
err_ioremap:
err_irq: err_irq:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err_rmr:
usb_put_hcd(hcd); usb_put_hcd(hcd);
return rv; return rv;
@ -227,9 +216,6 @@ static int ehci_hcd_xilinx_of_remove(struct platform_device *op)
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);
return 0; return 0;