Commit 299e7e97 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

ASoC: fsl_ssi: Use devm_snd_soc_register_component()

Using devm_snd_soc_register_component() can make the code shorter and
cleaner.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838
...@@ -1390,8 +1390,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) ...@@ -1390,8 +1390,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component, ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
&ssi_private->cpu_dai_drv, 1); &ssi_private->cpu_dai_drv, 1);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
goto error_asoc_register; goto error_asoc_register;
...@@ -1404,13 +1404,13 @@ static int fsl_ssi_probe(struct platform_device *pdev) ...@@ -1404,13 +1404,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "could not claim irq %u\n", dev_err(&pdev->dev, "could not claim irq %u\n",
ssi_private->irq); ssi_private->irq);
goto error_irq; goto error_asoc_register;
} }
} }
ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev); ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev);
if (ret) if (ret)
goto error_irq; goto error_asoc_register;
/* /*
* If codec-handle property is missing from SSI node, we assume * If codec-handle property is missing from SSI node, we assume
...@@ -1451,9 +1451,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) ...@@ -1451,9 +1451,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
error_sound_card: error_sound_card:
fsl_ssi_debugfs_remove(&ssi_private->dbg_stats); fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
error_irq:
snd_soc_unregister_component(&pdev->dev);
error_asoc_register: error_asoc_register:
if (ssi_private->soc->imx) if (ssi_private->soc->imx)
fsl_ssi_imx_clean(pdev, ssi_private); fsl_ssi_imx_clean(pdev, ssi_private);
...@@ -1469,7 +1466,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) ...@@ -1469,7 +1466,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
if (ssi_private->pdev) if (ssi_private->pdev)
platform_device_unregister(ssi_private->pdev); platform_device_unregister(ssi_private->pdev);
snd_soc_unregister_component(&pdev->dev);
if (ssi_private->soc->imx) if (ssi_private->soc->imx)
fsl_ssi_imx_clean(pdev, ssi_private); fsl_ssi_imx_clean(pdev, ssi_private);
......
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