Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 16:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: ohci-exynos: use devm_ functions

Browse Source 
The devm_ functions allocate memory that is released when a driver
detaches. This makes the code smaller and a bit simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jingoo Han 2012-06-28 16:30:30 +09:00 committed by Greg Kroah-Hartman
parent e864abed54
commit 390a0a7806
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/host/ohci-exynos.c
View File

@ -87,7 +87,8 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL); exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd),
GFP_KERNEL);
if (!exynos_ohci) if (!exynos_ohci)
return -ENOMEM; return -ENOMEM;
@ -97,8 +98,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
dev_name(&pdev->dev)); dev_name(&pdev->dev));
if (!hcd) { if (!hcd) {
dev_err(&pdev->dev, "Unable to create HCD\n"); dev_err(&pdev->dev, "Unable to create HCD\n");
err = -ENOMEM; return -ENOMEM;
goto fail_hcd;
} }
exynos_ohci->hcd = hcd; exynos_ohci->hcd = hcd;
@ -123,7 +123,7 @@ static int __devinit exynos_ohci_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);
hcd->regs = ioremap(res->start, resource_size(res)); hcd->regs = devm_ioremap(&pdev->dev, res->start, hcd->rsrc_len);
if (!hcd->regs) { if (!hcd->regs) {
dev_err(&pdev->dev, "Failed to remap I/O memory\n"); dev_err(&pdev->dev, "Failed to remap I/O memory\n");
err = -ENOMEM; err = -ENOMEM;
@ -134,7 +134,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
if (!irq) { if (!irq) {
dev_err(&pdev->dev, "Failed to get IRQ\n"); dev_err(&pdev->dev, "Failed to get IRQ\n");
err = -ENODEV; err = -ENODEV;
goto fail; goto fail_io;
} }
if (pdata->phy_init) if (pdata->phy_init)
@ -146,23 +146,19 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
err = usb_add_hcd(hcd, irq, IRQF_SHARED); err = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (err) { if (err) {
dev_err(&pdev->dev, "Failed to add USB HCD\n"); dev_err(&pdev->dev, "Failed to add USB HCD\n");
goto fail; goto fail_io;
} }
platform_set_drvdata(pdev, exynos_ohci); platform_set_drvdata(pdev, exynos_ohci);
return 0; return 0;
fail:
iounmap(hcd->regs);
fail_io: fail_io:
clk_disable(exynos_ohci->clk); clk_disable(exynos_ohci->clk);
fail_clken: fail_clken:
clk_put(exynos_ohci->clk); clk_put(exynos_ohci->clk);
fail_clk: fail_clk:
usb_put_hcd(hcd); usb_put_hcd(hcd);
fail_hcd:
kfree(exynos_ohci);
return err; return err;
} }
@ -177,13 +173,10 @@ static int __devexit exynos_ohci_remove(struct platform_device *pdev)
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
iounmap(hcd->regs);
clk_disable(exynos_ohci->clk); clk_disable(exynos_ohci->clk);
clk_put(exynos_ohci->clk); clk_put(exynos_ohci->clk);
usb_put_hcd(hcd); usb_put_hcd(hcd);
kfree(exynos_ohci);
return 0; return 0;
} }