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

Commit d644a115 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: samsung-i2s: Use devm_snd_soc_register_component() 



Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9a8e0322

sound/soc/samsung/i2s.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1143,7 +1143,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "Unable to get drvdata\n");

			dev_err(&pdev->dev, "Unable to get drvdata\n");

			return -EFAULT;

			return -EFAULT;

		}

		}

		snd_soc_register_component(&sec_dai->pdev->dev,

		devm_snd_soc_register_component(&sec_dai->pdev->dev,

						&samsung_i2s_component,

						&samsung_i2s_component,

						&sec_dai->i2s_dai_drv, 1);

						&sec_dai->i2s_dai_drv, 1);

		samsung_asoc_dma_platform_register(&pdev->dev);

		samsung_asoc_dma_platform_register(&pdev->dev);
@@ -1258,7 +1258,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
		goto err;

		goto err;

	}

	}





	snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,

	devm_snd_soc_register_component(&pri_dai->pdev->dev,

					&samsung_i2s_component,

					&pri_dai->i2s_dai_drv, 1);

					&pri_dai->i2s_dai_drv, 1);





	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(&pdev->dev);
@@ -1294,7 +1295,6 @@ static int samsung_i2s_remove(struct platform_device *pdev) 
	i2s->sec_dai = NULL;

	i2s->sec_dai = NULL;





	samsung_asoc_dma_platform_unregister(&pdev->dev);

	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);





	return 0;

	return 0;

}

}