diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-26 20:55:01 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-28 17:22:41 +0000 |
| commit | 558460c65af17f70a0d7adece0f73b8ab968a0f8 (patch) | |
| tree | ff93b04c3d20f65e0a08596531abec802e480f8c /sound/soc/codecs/jz4740.c | |
| parent | 38b81c1d2517d7c4a6685d49136474bcd0105ab9 (diff) | |
| download | linux-stable-558460c65af17f70a0d7adece0f73b8ab968a0f8.tar.gz linux-stable-558460c65af17f70a0d7adece0f73b8ab968a0f8.tar.bz2 linux-stable-558460c65af17f70a0d7adece0f73b8ab968a0f8.zip | |
ASoC: Convert jz4740 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/jz4740.c')
| -rw-r--r-- | sound/soc/codecs/jz4740.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index d73d28317c00..4624e752a188 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -353,7 +353,8 @@ 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; @@ -361,14 +362,14 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev) 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)); @@ -394,9 +395,7 @@ err_iounmap: 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; } @@ -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; } |