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

Commit 83d85f53 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: switch over to use snd_soc_register_component() on kirkwood i2s 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 29cc15cf

sound/soc/kirkwood/kirkwood-i2s.c

+8 −3
Original line number Diff line number Diff line
@@ -451,6 +451,10 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = { 
	.ops = &kirkwood_i2s_dai_ops,

};



static const struct snd_soc_component_driver kirkwood_i2s_component = {

	.name		= DRV_NAME,

};



static int kirkwood_i2s_dev_probe(struct platform_device *pdev)

{

	struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
@@ -524,10 +528,11 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) 
		priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128;

	}



	err = snd_soc_register_dai(&pdev->dev, soc_dai);

	err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,

					 soc_dai, 1);

	if (!err)

		return 0;

	dev_err(&pdev->dev, "snd_soc_register_dai failed\n");

	dev_err(&pdev->dev, "snd_soc_register_component failed\n");



	if (!IS_ERR(priv->extclk)) {

		clk_disable_unprepare(priv->extclk);
@@ -542,7 +547,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) 
{

	struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_dai(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	if (!IS_ERR(priv->extclk)) {

		clk_disable_unprepare(priv->extclk);