Skip to content

Commit

Permalink
ASoC: Convert jz4740 to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 28, 2011
1 parent 38b81c1 commit 558460c
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions sound/soc/codecs/jz4740.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,22 +353,23 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev)
struct jz4740_codec *jz4740_codec;
struct resource *mem;

jz4740_codec = kzalloc(sizeof(*jz4740_codec), GFP_KERNEL);
jz4740_codec = devm_kzalloc(&pdev->dev, sizeof(*jz4740_codec),
GFP_KERNEL);
if (!jz4740_codec)
return -ENOMEM;

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) {
dev_err(&pdev->dev, "Failed to get mmio memory resource\n");
ret = -ENOENT;
goto err_free_codec;
goto err_out;
}

mem = request_mem_region(mem->start, resource_size(mem), pdev->name);
if (!mem) {
dev_err(&pdev->dev, "Failed to request mmio memory region\n");
ret = -EBUSY;
goto err_free_codec;
goto err_out;
}

jz4740_codec->base = ioremap(mem->start, resource_size(mem));
Expand All @@ -394,9 +395,7 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev)
iounmap(jz4740_codec->base);
err_release_mem_region:
release_mem_region(mem->start, resource_size(mem));
err_free_codec:
kfree(jz4740_codec);

err_out:
return ret;
}

Expand All @@ -411,7 +410,6 @@ static int __devexit jz4740_codec_remove(struct platform_device *pdev)
release_mem_region(mem->start, resource_size(mem));

platform_set_drvdata(pdev, NULL);
kfree(jz4740_codec);

return 0;
}
Expand Down

0 comments on commit 558460c

Please sign in to comment.