Commit 45c26091 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown

ASoC: Tegra TrimSlice machine: Use devm_ APIs and module_platform_driver

module_platform_driver saves some boiler-plate code.

The devm_ APIs remove the need to manually clean up allocations,
thus removing some code.
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e4e4c18a
...@@ -170,15 +170,17 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev) ...@@ -170,15 +170,17 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
struct tegra_trimslice *trimslice; struct tegra_trimslice *trimslice;
int ret; int ret;
trimslice = kzalloc(sizeof(struct tegra_trimslice), GFP_KERNEL); trimslice = devm_kzalloc(&pdev->dev, sizeof(struct tegra_trimslice),
GFP_KERNEL);
if (!trimslice) { if (!trimslice) {
dev_err(&pdev->dev, "Can't allocate tegra_trimslice\n"); 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); ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
if (ret) if (ret)
goto err_free_trimslice; goto err;
card->dev = &pdev->dev; card->dev = &pdev->dev;
platform_set_drvdata(pdev, card); platform_set_drvdata(pdev, card);
...@@ -195,8 +197,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev) ...@@ -195,8 +197,7 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)
err_fini_utils: err_fini_utils:
tegra_asoc_utils_fini(&trimslice->util_data); tegra_asoc_utils_fini(&trimslice->util_data);
err_free_trimslice: err:
kfree(trimslice);
return ret; return ret;
} }
...@@ -209,8 +210,6 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev) ...@@ -209,8 +210,6 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev)
tegra_asoc_utils_fini(&trimslice->util_data); tegra_asoc_utils_fini(&trimslice->util_data);
kfree(trimslice);
return 0; return 0;
} }
...@@ -222,18 +221,7 @@ static struct platform_driver tegra_snd_trimslice_driver = { ...@@ -222,18 +221,7 @@ static struct platform_driver tegra_snd_trimslice_driver = {
.probe = tegra_snd_trimslice_probe, .probe = tegra_snd_trimslice_probe,
.remove = __devexit_p(tegra_snd_trimslice_remove), .remove = __devexit_p(tegra_snd_trimslice_remove),
}; };
module_platform_driver(tegra_snd_trimslice_driver);
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_AUTHOR("Mike Rapoport <mike@compulab.co.il>"); MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
MODULE_DESCRIPTION("Trimslice machine ASoC driver"); MODULE_DESCRIPTION("Trimslice machine ASoC driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment