From: thierry.reding@avionic-design.de (Thierry Reding)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 13/17] ASoC: Tegra TrimSlice machine: Use devm_ APIs and module_platform_driver
Date: Wed, 23 Nov 2011 08:06:27 +0100 [thread overview]
Message-ID: <20111123070627.GF5255@avionic-0098.adnet.avionic-design.de> (raw)
In-Reply-To: <1322011285-4002-14-git-send-email-swarren@nvidia.com>
* Stephen Warren wrote:
> module_platform_drive saves some boiler-plate code.
Some here.
>
> 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/trimslice.c | 26 +++++++-------------------
> 1 files changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
> index 2699a6f..d564b40 100644
> --- a/sound/soc/tegra/trimslice.c
> +++ b/sound/soc/tegra/trimslice.c
> @@ -170,15 +170,17 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
> struct tegra_trimslice *trimslice;
> int ret;
>
> - trimslice = kzalloc(sizeof(struct tegra_trimslice), GFP_KERNEL);
> + trimslice = devm_kzalloc(&pdev->dev, sizeof(struct tegra_trimslice),
> + GFP_KERNEL);
> if (!trimslice) {
> dev_err(&pdev->dev, "Can't allocate tegra_trimslice\n");
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto err;
> }
>
> ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
> if (ret)
> - goto err_free_trimslice;
> + goto err;
>
> card->dev = &pdev->dev;
> platform_set_drvdata(pdev, card);
> @@ -195,8 +197,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
>
> err_fini_utils:
> tegra_asoc_utils_fini(&trimslice->util_data);
> -err_free_trimslice:
> - kfree(trimslice);
> +err:
> return ret;
> }
>
> @@ -209,8 +210,6 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev)
>
> tegra_asoc_utils_fini(&trimslice->util_data);
>
> - kfree(trimslice);
> -
> return 0;
> }
>
> @@ -222,18 +221,7 @@ static struct platform_driver tegra_snd_trimslice_driver = {
> .probe = tegra_snd_trimslice_probe,
> .remove = __devexit_p(tegra_snd_trimslice_remove),
> };
> -
> -static int __init snd_tegra_trimslice_init(void)
> -{
> - return platform_driver_register(&tegra_snd_trimslice_driver);
> -}
> -module_init(snd_tegra_trimslice_init);
> -
> -static void __exit snd_tegra_trimslice_exit(void)
> -{
> - platform_driver_unregister(&tegra_snd_trimslice_driver);
> -}
> -module_exit(snd_tegra_trimslice_exit);
> +module_platform_driver(tegra_snd_trimslice_driver);
>
> MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
> MODULE_DESCRIPTION("Trimslice machine ASoC driver");
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
-------------- 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/9a5fe6ca/attachment.sig>
next prev parent reply other threads:[~2011-11-23 7:06 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
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 [this message]
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=20111123070627.GF5255@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).