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

mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap()

Browse source 
Use devm_ variants of kzalloc and ioremap. Also clean up error path.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Roger Quadros 2012-11-26 17:59:22 +02:00
parent a1f0d7a1f8
commit 27d4f2c654
1 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/mfd/omap-usb-host.c
View file

@ -461,15 +461,20 @@ static int usbhs_omap_probe(struct platform_device *pdev)
if (!pdata) { if (!pdata) {
dev_err(dev, "Missing platform data\n"); dev_err(dev, "Missing platform data\n");
ret = -ENOMEM; return -ENODEV;
goto end_probe;
} }
omap = kzalloc(sizeof(*omap), GFP_KERNEL); omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
if (!omap) { if (!omap) {
dev_err(dev, "Memory allocation failed\n"); dev_err(dev, "Memory allocation failed\n");
ret = -ENOMEM; return -ENOMEM;
goto end_probe; }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
omap->uhh_base = devm_request_and_ioremap(dev, res);
if (!omap->uhh_base) {
dev_err(dev, "Resource request/ioremap failed\n");
return -EADDRNOTAVAIL;
} }
spin_lock_init(&omap->lock); spin_lock_init(&omap->lock);
@ -568,20 +573,6 @@ static int usbhs_omap_probe(struct platform_device *pdev)
"failed error:%d\n", ret); "failed error:%d\n", ret);
} }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
if (!res) {
dev_err(dev, "UHH EHCI get resource failed\n");
ret = -ENODEV;
goto err_init_60m_fclk;
}
omap->uhh_base = ioremap(res->start, resource_size(res));
if (!omap->uhh_base) {
dev_err(dev, "UHH ioremap failed\n");
ret = -ENOMEM;
goto err_init_60m_fclk;
}
platform_set_drvdata(pdev, omap); platform_set_drvdata(pdev, omap);
omap_usbhs_init(dev); omap_usbhs_init(dev);
@ -591,13 +582,10 @@ static int usbhs_omap_probe(struct platform_device *pdev)
goto err_alloc; goto err_alloc;
} }
goto end_probe; return 0;
err_alloc: err_alloc:
omap_usbhs_deinit(&pdev->dev); omap_usbhs_deinit(&pdev->dev);
iounmap(omap->uhh_base);
err_init_60m_fclk:
clk_put(omap->init_60m_fclk); clk_put(omap->init_60m_fclk);
err_usbhost_p2_fck: err_usbhost_p2_fck:
@ -621,9 +609,7 @@ static int usbhs_omap_probe(struct platform_device *pdev)
err_end: err_end:
clk_put(omap->ehci_logic_fck); clk_put(omap->ehci_logic_fck);
pm_runtime_disable(dev); pm_runtime_disable(dev);
kfree(omap);
end_probe:
return ret; return ret;
} }
@ -638,7 +624,6 @@ static int usbhs_omap_remove(struct platform_device *pdev)
struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev); struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
omap_usbhs_deinit(&pdev->dev); omap_usbhs_deinit(&pdev->dev);
iounmap(omap->uhh_base);
clk_put(omap->init_60m_fclk); clk_put(omap->init_60m_fclk);
clk_put(omap->usbhost_p2_fck); clk_put(omap->usbhost_p2_fck);
clk_put(omap->usbhost_p1_fck); clk_put(omap->usbhost_p1_fck);
@ -648,7 +633,6 @@ static int usbhs_omap_remove(struct platform_device *pdev)
clk_put(omap->utmi_p1_fck); clk_put(omap->utmi_p1_fck);
clk_put(omap->ehci_logic_fck); clk_put(omap->ehci_logic_fck);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
kfree(omap);
return 0; return 0;
} }