leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: tegra: Convert to managed resources

Browse Source 
Use managed resource functions devm_clk_put and
devm_snd_soc_register_component to simplify error handling.

To be compatible with the change various gotos are replaced
with direct returns, and unneeded labels are dropped.

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vaishali Thakkar 2015-08-13 12:59:21 +05:30 committed by Mark Brown
parent 8833c01af6
commit 470805eb9f
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sound/soc/tegra/tegra20_spdif.c
View File

@ -273,45 +273,40 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
if (!spdif) { if (!spdif) {
dev_err(&pdev->dev, "Can't allocate tegra20_spdif\n"); dev_err(&pdev->dev, "Can't allocate tegra20_spdif\n");
ret = -ENOMEM; return -ENOMEM;
goto err;
} }
dev_set_drvdata(&pdev->dev, spdif); dev_set_drvdata(&pdev->dev, spdif);
spdif->clk_spdif_out = clk_get(&pdev->dev, "spdif_out"); spdif->clk_spdif_out = devm_clk_get(&pdev->dev, "spdif_out");
if (IS_ERR(spdif->clk_spdif_out)) { if (IS_ERR(spdif->clk_spdif_out)) {
pr_err("Can't retrieve spdif clock\n"); pr_err("Can't retrieve spdif clock\n");
ret = PTR_ERR(spdif->clk_spdif_out); ret = PTR_ERR(spdif->clk_spdif_out);
goto err; return ret;
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { if (!mem) {
dev_err(&pdev->dev, "No memory resource\n"); dev_err(&pdev->dev, "No memory resource\n");
ret = -ENODEV; return -ENODEV;
goto err_clk_put;
} }
dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0); dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!dmareq) { if (!dmareq) {
dev_err(&pdev->dev, "No DMA resource\n"); dev_err(&pdev->dev, "No DMA resource\n");
ret = -ENODEV; return -ENODEV;
goto err_clk_put;
} }
memregion = devm_request_mem_region(&pdev->dev, mem->start, memregion = devm_request_mem_region(&pdev->dev, mem->start,
resource_size(mem), DRV_NAME); resource_size(mem), DRV_NAME);
if (!memregion) { if (!memregion) {
dev_err(&pdev->dev, "Memory region already claimed\n"); dev_err(&pdev->dev, "Memory region already claimed\n");
ret = -EBUSY; return -EBUSY;
goto err_clk_put;
} }
regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
if (!regs) { if (!regs) {
dev_err(&pdev->dev, "ioremap failed\n"); dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM; return -ENOMEM;
goto err_clk_put;
} }
spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs, spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
@ -319,7 +314,7 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
if (IS_ERR(spdif->regmap)) { if (IS_ERR(spdif->regmap)) {
dev_err(&pdev->dev, "regmap init failed\n"); dev_err(&pdev->dev, "regmap init failed\n");
ret = PTR_ERR(spdif->regmap); ret = PTR_ERR(spdif->regmap);
goto err_clk_put; return ret;
} }
spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT; spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT;
@ -334,8 +329,9 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
goto err_pm_disable; goto err_pm_disable;
} }
ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component, ret = devm_snd_soc_register_component(&pdev->dev,
&tegra20_spdif_dai, 1); &tegra20_spdif_component,
&tegra20_spdif_dai, 1);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
ret = -ENOMEM; ret = -ENOMEM;
@ -345,21 +341,17 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
ret = tegra_pcm_platform_register(&pdev->dev); ret = tegra_pcm_platform_register(&pdev->dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
goto err_unregister_component; return ret;
} }
return 0; return 0;
err_unregister_component:
snd_soc_unregister_component(&pdev->dev);
err_suspend: err_suspend:
if (!pm_runtime_status_suspended(&pdev->dev)) if (!pm_runtime_status_suspended(&pdev->dev))
tegra20_spdif_runtime_suspend(&pdev->dev); tegra20_spdif_runtime_suspend(&pdev->dev);
err_pm_disable: err_pm_disable:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
err_clk_put:
clk_put(spdif->clk_spdif_out);
err:
return ret; return ret;
} }
@ -372,9 +364,6 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev)
tegra20_spdif_runtime_suspend(&pdev->dev); tegra20_spdif_runtime_suspend(&pdev->dev);
tegra_pcm_platform_unregister(&pdev->dev); tegra_pcm_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);
clk_put(spdif->clk_spdif_out);
return 0; return 0;
} }