From: Julia Lawall <julia.lawall@lip6.fr>
To: Dong Aisheng-B29396 <B29396@freescale.com>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>, Liam Girdwood <lrg@ti.com>,
"kernel-janitors@vger.kernel.org"
<kernel-janitors@vger.kernel.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 1/15] sound/soc/mxs/mxs-saif.c: add missing iounmap
Date: Tue, 24 Jan 2012 18:29:13 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.02.1201241828480.1779@localhost6.localdomain6> (raw)
In-Reply-To: <7FE21149F4667147B645348EC605788508FBDB@039-SN2MPN1-013.039d.mgd.msft.net>
From: Julia Lawall <Julia.Lawall@lip6.fr>
The various devm_ functions allocate memory that is released when a driver
detaches. This patch uses these functions for data that is allocated in
the probe function of a platform device and is only freed in the remove
function.
By removing the need for iounmap, this also eliminates a missing iounmap
problem, in the the original error handling code following a successful
call to ioremap.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
sound/soc/mxs/mxs-saif.c | 44 ++++++++++++++------------------------------
1 file changed, 14 insertions(+), 30 deletions(-)
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index f204dba..6a72ad9 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -630,7 +630,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
if (pdev->id >= ARRAY_SIZE(mxs_saif))
return -EINVAL;
- saif = kzalloc(sizeof(*saif), GFP_KERNEL);
+ saif = devm_kzalloc(&pdev->dev, sizeof(*saif), GFP_KERNEL);
if (!saif)
return -ENOMEM;
@@ -652,10 +652,9 @@ static int mxs_saif_probe(struct platform_device *pdev)
saif->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(saif->clk)) {
- ret = PTR_ERR(saif->clk);
dev_err(&pdev->dev, "Cannot get the clock: %d\n",
ret);
- goto failed_clk;
+ return PTR_ERR(saif->clk);
}
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -666,18 +665,19 @@ static int mxs_saif_probe(struct platform_device *pdev)
goto failed_get_resource;
}
- if (!request_mem_region(iores->start, resource_size(iores),
- "mxs-saif")) {
+ if (!devm_request_mem_region(&pdev->dev, iores->start,
+ resource_size(iores), "mxs-saif")) {
dev_err(&pdev->dev, "request_mem_region failed\n");
ret = -EBUSY;
goto failed_get_resource;
}
- saif->base = ioremap(iores->start, resource_size(iores));
+ saif->base = devm_ioremap(&pdev->dev, iores->start,
+ resource_size(iores));
if (!saif->base) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENODEV;
- goto failed_ioremap;
+ goto failed_get_resource;
}
dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
@@ -685,7 +685,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = -ENODEV;
dev_err(&pdev->dev, "failed to get dma resource: %d\n",
ret);
- goto failed_ioremap;
+ goto failed_get_resource;
}
saif->dma_param.chan_num = dmares->start;
@@ -694,14 +694,15 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = saif->irq;
dev_err(&pdev->dev, "failed to get irq resource: %d\n",
ret);
- goto failed_get_irq1;
+ goto failed_get_resource;
}
saif->dev = &pdev->dev;
- ret = request_irq(saif->irq, mxs_saif_irq, 0, "mxs-saif", saif);
+ ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,
+ "mxs-saif", saif);
if (ret) {
dev_err(&pdev->dev, "failed to request irq\n");
- goto failed_get_irq1;
+ goto failed_get_resource;
}
saif->dma_param.chan_irq = platform_get_irq(pdev, 1);
@@ -709,7 +710,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = saif->dma_param.chan_irq;
dev_err(&pdev->dev, "failed to get dma irq resource: %d\n",
ret);
- goto failed_get_irq2;
+ goto failed_get_resource;
}
platform_set_drvdata(pdev, saif);
@@ -717,7 +718,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
if (ret) {
dev_err(&pdev->dev, "register DAI failed\n");
- goto failed_register;
+ goto failed_get_resource;
}
saif->soc_platform_pdev = platform_device_alloc(
@@ -740,36 +741,19 @@ failed_pdev_add:
platform_device_put(saif->soc_platform_pdev);
failed_pdev_alloc:
snd_soc_unregister_dai(&pdev->dev);
-failed_register:
-failed_get_irq2:
- free_irq(saif->irq, saif);
-failed_get_irq1:
- iounmap(saif->base);
-failed_ioremap:
- release_mem_region(iores->start, resource_size(iores));
failed_get_resource:
clk_put(saif->clk);
-failed_clk:
- kfree(saif);
return ret;
}
static int __devexit mxs_saif_remove(struct platform_device *pdev)
{
- struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct mxs_saif *saif = platform_get_drvdata(pdev);
platform_device_unregister(saif->soc_platform_pdev);
-
snd_soc_unregister_dai(&pdev->dev);
-
- iounmap(saif->base);
- release_mem_region(res->start, resource_size(res));
- free_irq(saif->irq, saif);
-
clk_put(saif->clk);
- kfree(saif);
return 0;
}
next prev parent reply other threads:[~2012-01-24 17:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 9:55 [PATCH 1/15] sound/soc/mxs/mxs-saif.c: add missing iounmap Julia Lawall
2012-01-12 10:45 ` Felipe Balbi
2012-01-13 6:25 ` Dong Aisheng-B29396
2012-01-13 6:32 ` Julia Lawall
2012-01-24 17:29 ` Julia Lawall [this message]
2012-01-24 20:22 ` Mark Brown
2012-01-24 20:36 ` Julia Lawall
2012-01-24 20:45 ` Julia Lawall
2012-01-26 10:53 ` Mark Brown
2012-01-26 11:24 ` Julia Lawall
2012-01-26 11:27 ` Mark Brown
2012-01-26 11:05 ` [alsa-devel] " Wolfram Sang
2012-01-26 11:21 ` Julia Lawall
2012-01-26 11:22 ` Mark Brown
2012-01-26 13:40 ` Julia Lawall
2012-01-26 13:51 ` Wolfram Sang
2012-01-26 14:07 ` Julia Lawall
2012-01-28 8:26 ` Wolfram Sang
2012-01-28 8:51 ` Julia Lawall
2012-02-04 18:25 ` devm_request_and_ioremap Julia Lawall
2012-02-04 18:46 ` devm_request_and_ioremap Mark Brown
2012-02-04 22:08 ` devm_request_and_ioremap Julia Lawall
2012-02-06 16:21 ` devm_request_and_ioremap Mark Brown
2012-01-28 7:03 ` [alsa-devel] [PATCH 1/15] sound/soc/mxs/mxs-saif.c: add missing iounmap Julia Lawall
2012-01-28 8:29 ` Wolfram Sang
2012-02-06 16:20 ` Mark Brown
2012-02-08 10:18 ` Dong Aisheng
2012-02-08 12:39 ` Julia Lawall
2012-01-26 11:25 ` Wolfram Sang
2012-01-26 11:28 ` Julia Lawall
2012-01-26 11:57 ` walter harms
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1201241828480.1779@localhost6.localdomain6 \
--to=julia.lawall@lip6.fr \
--cc=B29396@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).