nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ARM: pxa: ssp: use devm_ functions

Browse source 
Use devm_ functions to allocate memory, ioremap, clk_get etc to clean up
the error unwind path.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Daniel Mack 2013-08-12 10:37:17 +02:00 committed by Mark Brown
parent a6e56c28a1
commit 1c459de1e6
1 changed files with 12 additions and 28 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

40
arch/arm/plat-pxa/ssp.c
View file

@ -94,19 +94,16 @@ static int pxa_ssp_probe(struct platform_device *pdev)
struct resource *res;
struct ssp_device *ssp;
struct device *dev = &pdev->dev;
int ret = 0;
ssp = kzalloc(sizeof(struct ssp_device), GFP_KERNEL);
ssp = devm_kzalloc(dev, sizeof(struct ssp_device), GFP_KERNEL);
if (ssp == NULL)
return -ENOMEM;
ssp->pdev = pdev;
ssp->clk = clk_get(dev, NULL);
if (IS_ERR(ssp->clk)) {
ret = PTR_ERR(ssp->clk);
goto err_free;
}
ssp->clk = devm_clk_get(dev, NULL);
if (IS_ERR(ssp->clk))
return PTR_ERR(ssp->clk);
if (dev->of_node) {
struct of_phandle_args dma_spec;
@ -148,32 +145,28 @@ static int pxa_ssp_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) {
dev_err(dev, "no memory resource defined\n");
ret = -ENODEV;
goto err_free_clk;
return -ENODEV;
}
res = request_mem_region(res->start, resource_size(res),
pdev->name);
res = devm_request_mem_region(dev, res->start, resource_size(res),
pdev->name);
if (res == NULL) {
dev_err(dev, "failed to request memory resource\n");
ret = -EBUSY;
goto err_free_clk;
return -EBUSY;
}
ssp->phys_base = res->start;
ssp->mmio_base = ioremap(res->start, resource_size(res));
ssp->mmio_base = devm_ioremap(dev, res->start, resource_size(res));
if (ssp->mmio_base == NULL) {
dev_err(dev, "failed to ioremap() registers\n");
ret = -ENODEV;
goto err_free_mem;
return -ENODEV;
}
ssp->irq = platform_get_irq(pdev, 0);
if (ssp->irq < 0) {
dev_err(dev, "no IRQ resource defined\n");
ret = -ENODEV;
goto err_free_io;
return -ENODEV;
}
if (dev->of_node) {
@ -198,17 +191,8 @@ static int pxa_ssp_probe(struct platform_device *pdev)
mutex_unlock(&ssp_lock);
platform_set_drvdata(pdev, ssp);
return 0;
err_free_io:
iounmap(ssp->mmio_base);
err_free_mem:
release_mem_region(res->start, resource_size(res));
err_free_clk:
clk_put(ssp->clk);
err_free:
kfree(ssp);
return ret;
return 0;
}
static int pxa_ssp_remove(struct platform_device *pdev)