Skip to content

Commit

Permalink
ASoC: fsl_ssi: Use devm_snd_soc_register_component()
Browse files Browse the repository at this point in the history
Using devm_snd_soc_register_component() can make the code shorter and
cleaner.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Fabio Estevam authored and Mark Brown committed Apr 10, 2015
1 parent c517d83 commit 299e7e9
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1390,8 +1390,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
return ret;
}

ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
&ssi_private->cpu_dai_drv, 1);
ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
&ssi_private->cpu_dai_drv, 1);
if (ret) {
dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
goto error_asoc_register;
Expand All @@ -1404,13 +1404,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(&pdev->dev, "could not claim irq %u\n",
ssi_private->irq);
goto error_irq;
goto error_asoc_register;
}
}

ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev);
if (ret)
goto error_irq;
goto error_asoc_register;

/*
* If codec-handle property is missing from SSI node, we assume
Expand Down Expand Up @@ -1451,9 +1451,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
error_sound_card:
fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);

error_irq:
snd_soc_unregister_component(&pdev->dev);

error_asoc_register:
if (ssi_private->soc->imx)
fsl_ssi_imx_clean(pdev, ssi_private);
Expand All @@ -1469,7 +1466,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)

if (ssi_private->pdev)
platform_device_unregister(ssi_private->pdev);
snd_soc_unregister_component(&pdev->dev);

if (ssi_private->soc->imx)
fsl_ssi_imx_clean(pdev, ssi_private);
Expand Down

0 comments on commit 299e7e9

Please sign in to comment.