Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/fsl/fsl_ssi.c

+4 −8
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
			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);

	if (ret) {

		dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
@@ -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
@@ -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);
@@ -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);