From: thierry.reding@avionic-design.de (Thierry Reding)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/17] ASoC: Tegra I2S: Use devm_ APIs and module_platform_driver
Date: Wed, 23 Nov 2011 08:00:27 +0100 [thread overview]
Message-ID: <20111123070027.GC5255@avionic-0098.adnet.avionic-design.de> (raw)
In-Reply-To: <1322011285-4002-9-git-send-email-swarren@nvidia.com>
* Stephen Warren wrote:
> module_platform_drive saves some boiler-plate code.
>
> The devm_ APIs remove the need to manually clean up allocations,
> thus removing some code.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> sound/soc/tegra/tegra_i2s.c | 45 +++++++++---------------------------------
> 1 files changed, 10 insertions(+), 35 deletions(-)
>
> diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
[...]
> @@ -422,43 +422,29 @@ static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
> if (ret) {
> dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
> ret = -ENOMEM;
> - goto err_unmap;
> + goto err_clk_put;
> }
>
> tegra_i2s_debug_add(i2s, pdev->id);
>
> return 0;
>
> -err_unmap:
> - iounmap(i2s->regs);
> -err_release:
> - release_mem_region(mem->start, resource_size(mem));
> err_clk_put:
> clk_put(i2s->clk_i2s);
> -err_free:
> - kfree(i2s);
> -exit:
> +err:
> return ret;
> }
>
> static int __devexit tegra_i2s_platform_remove(struct platform_device *pdev)
> {
> struct tegra_i2s *i2s = dev_get_drvdata(&pdev->dev);
> - struct resource *res;
>
> snd_soc_unregister_dai(&pdev->dev);
>
> tegra_i2s_debug_remove(i2s);
>
> - iounmap(i2s->regs);
> -
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(res->start, resource_size(res));
> -
> clk_put(i2s->clk_i2s);
>
> - kfree(i2s);
> -
> return 0;
> }
[...]
Is this perhaps missing a dev_set_drvdata(&pdev->dev, NULL) as well?
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111123/59ee7e39/attachment.sig>
next prev parent reply other threads:[~2011-11-23 7:00 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 1:21 [PATCH 00/17] ASoC: Add Tegra DT, cleanup, and related Stephen Warren
2011-11-23 1:21 ` [PATCH 01/17] arm/tegra: board-dt: audio: Enable clocks, fix AUXDATA Stephen Warren
2011-11-23 10:38 ` Mark Brown
2011-11-23 17:44 ` Stephen Warren
2011-11-23 22:01 ` Olof Johansson
2011-11-23 1:21 ` [PATCH 02/17] arm/dt: Tegra: Clean up I2S and DAS nodes Stephen Warren
2011-11-23 1:21 ` [PATCH 03/17] arm/dt: Tegra: Enable audio on WM8903 boards, disable others Stephen Warren
2011-11-23 16:50 ` Stephen Warren
2011-11-23 1:21 ` [PATCH 04/17] ASoC: Add device tree binding for WM8903 Stephen Warren
2011-11-23 10:20 ` Mark Brown
2011-11-23 1:21 ` [PATCH 05/17] ASoC: Tegra: Move DAS configuration into machine drivers Stephen Warren
2011-11-23 10:24 ` Mark Brown
2011-11-23 1:21 ` [PATCH 06/17] ASoC: Tegra PCM: Use module_platform_driver Stephen Warren
2011-11-23 10:24 ` Mark Brown
2011-11-23 1:21 ` [PATCH 07/17] ASoC: Tegra DAS: Use devm_ APIs and module_platform_driver Stephen Warren
2011-11-23 6:58 ` Thierry Reding
2011-11-23 10:23 ` Mark Brown
2011-11-23 17:29 ` [alsa-devel] " Stephen Warren
2011-11-23 20:40 ` Thierry Reding
2011-11-23 10:25 ` Mark Brown
2011-11-23 1:21 ` [PATCH 08/17] ASoC: Tegra I2S: " Stephen Warren
2011-11-23 7:00 ` Thierry Reding [this message]
2011-11-23 10:25 ` Mark Brown
2011-11-23 1:21 ` [PATCH 09/17] ASoC: Tegra I2S: Remove dependency on pdev->id Stephen Warren
2011-11-23 11:03 ` Mark Brown
2011-11-23 17:54 ` Stephen Warren
2011-11-23 18:03 ` Mark Brown
2011-11-23 1:21 ` [PATCH 10/17] ASoC: Tegra DAS: Add device tree binding Stephen Warren
2011-11-23 11:07 ` Mark Brown
2011-11-23 1:21 ` [PATCH 11/17] ASoC: Tegra I2S: " Stephen Warren
2011-11-23 7:04 ` Thierry Reding
2011-11-23 10:48 ` Mark Brown
2011-11-23 10:57 ` Thierry Reding
2011-11-23 11:27 ` Mark Brown
2011-11-23 1:21 ` [PATCH 12/17] ASoC: Tegra+WM8903 machine: Use devm_ APIs and module_platform_driver Stephen Warren
2011-11-23 7:05 ` Thierry Reding
2011-11-23 11:08 ` Mark Brown
2011-11-23 1:21 ` [PATCH 13/17] ASoC: Tegra TrimSlice " Stephen Warren
2011-11-23 7:06 ` Thierry Reding
2011-11-23 11:11 ` Mark Brown
2011-11-23 1:21 ` [PATCH 14/17] ASoC: Implement "auto nc pins" feature Stephen Warren
2011-11-23 11:15 ` Mark Brown
2011-11-23 1:21 ` [PATCH 15/17] ASoC: Tegra+WM903 machine: Use new auto_nc_codec_pins feature Stephen Warren
2011-11-23 1:21 ` [PATCH 16/17] ASoC: TrimSlice " Stephen Warren
2011-11-23 1:21 ` [PATCH 17/17] ASoC: Tegra+WM8903 machine: Add device tree binding Stephen Warren
2011-11-23 7:15 ` Thierry Reding
2011-11-23 11:26 ` Mark Brown
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=20111123070027.GC5255@avionic-0098.adnet.avionic-design.de \
--to=thierry.reding@avionic-design.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).