lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: jz4740-adc: Use devm_kzalloc

Browse Source 
Use devm_kzalloc and remove the error path free'ing and unload free'ing
as the devm resource functions free them.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Devendra Naga 2012-11-24 06:14:38 -05:00 committed by Samuel Ortiz
parent 3253398385
commit 931cbaf352
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mfd/jz4740-adc.c
View File

@ -211,7 +211,7 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
int ret; int ret;
int irq_base; int irq_base;
adc = kmalloc(sizeof(*adc), GFP_KERNEL); adc = devm_kzalloc(&pdev->dev, sizeof(*adc), GFP_KERNEL);
if (!adc) { if (!adc) {
dev_err(&pdev->dev, "Failed to allocate driver structure\n"); dev_err(&pdev->dev, "Failed to allocate driver structure\n");
return -ENOMEM; return -ENOMEM;
@ -221,30 +221,27 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
if (adc->irq < 0) { if (adc->irq < 0) {
ret = adc->irq; ret = adc->irq;
dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret); dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret);
goto err_free; return ret;
} }
irq_base = platform_get_irq(pdev, 1); irq_base = platform_get_irq(pdev, 1);
if (irq_base < 0) { if (irq_base < 0) {
ret = irq_base; dev_err(&pdev->dev, "Failed to get irq base: %d\n", irq_base);
dev_err(&pdev->dev, "Failed to get irq base: %d\n", ret); return irq_base;
goto err_free;
} }
mem_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem_base) { if (!mem_base) {
ret = -ENOENT;
dev_err(&pdev->dev, "Failed to get platform mmio resource\n"); dev_err(&pdev->dev, "Failed to get platform mmio resource\n");
goto err_free; return -ENOENT;
} }
/* Only request the shared registers for the MFD driver */ /* Only request the shared registers for the MFD driver */
adc->mem = request_mem_region(mem_base->start, JZ_REG_ADC_STATUS, adc->mem = request_mem_region(mem_base->start, JZ_REG_ADC_STATUS,
pdev->name); pdev->name);
if (!adc->mem) { if (!adc->mem) {
ret = -EBUSY;
dev_err(&pdev->dev, "Failed to request mmio memory region\n"); dev_err(&pdev->dev, "Failed to request mmio memory region\n");
goto err_free; return -EBUSY;
} }
adc->base = ioremap_nocache(adc->mem->start, resource_size(adc->mem)); adc->base = ioremap_nocache(adc->mem->start, resource_size(adc->mem));
@ -301,9 +298,6 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
iounmap(adc->base); iounmap(adc->base);
err_release_mem_region: err_release_mem_region:
release_mem_region(adc->mem->start, resource_size(adc->mem)); release_mem_region(adc->mem->start, resource_size(adc->mem));
err_free:
kfree(adc);
return ret; return ret;
} }
@ -325,8 +319,6 @@ static int __devexit jz4740_adc_remove(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(adc);
return 0; return 0;
} }