提交 e4e4c18a 编写于 作者: S Stephen Warren 提交者: Mark Brown

ASoC: Tegra+WM8903 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: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 186bcda6
...@@ -390,17 +390,19 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) ...@@ -390,17 +390,19 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
machine = kzalloc(sizeof(struct tegra_wm8903), GFP_KERNEL); machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm8903),
GFP_KERNEL);
if (!machine) { if (!machine) {
dev_err(&pdev->dev, "Can't allocate tegra_wm8903 struct\n"); dev_err(&pdev->dev, "Can't allocate tegra_wm8903 struct\n");
return -ENOMEM; ret = -ENOMEM;
goto err;
} }
machine->pdata = pdata; machine->pdata = pdata;
ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
if (ret) if (ret)
goto err_free_machine; goto err;
card->dev = &pdev->dev; card->dev = &pdev->dev;
platform_set_drvdata(pdev, card); platform_set_drvdata(pdev, card);
...@@ -431,8 +433,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) ...@@ -431,8 +433,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
err_fini_utils: err_fini_utils:
tegra_asoc_utils_fini(&machine->util_data); tegra_asoc_utils_fini(&machine->util_data);
err_free_machine: err:
kfree(machine);
return ret; return ret;
} }
...@@ -460,8 +461,6 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev) ...@@ -460,8 +461,6 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
tegra_asoc_utils_fini(&machine->util_data); tegra_asoc_utils_fini(&machine->util_data);
kfree(machine);
return 0; return 0;
} }
...@@ -474,18 +473,7 @@ static struct platform_driver tegra_wm8903_driver = { ...@@ -474,18 +473,7 @@ static struct platform_driver tegra_wm8903_driver = {
.probe = tegra_wm8903_driver_probe, .probe = tegra_wm8903_driver_probe,
.remove = __devexit_p(tegra_wm8903_driver_remove), .remove = __devexit_p(tegra_wm8903_driver_remove),
}; };
module_platform_driver(tegra_wm8903_driver);
static int __init tegra_wm8903_modinit(void)
{
return platform_driver_register(&tegra_wm8903_driver);
}
module_init(tegra_wm8903_modinit);
static void __exit tegra_wm8903_modexit(void)
{
platform_driver_unregister(&tegra_wm8903_driver);
}
module_exit(tegra_wm8903_modexit);
MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>"); MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
MODULE_DESCRIPTION("Tegra+WM8903 machine ASoC driver"); MODULE_DESCRIPTION("Tegra+WM8903 machine ASoC driver");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册