commit da4f2f9e6b59d9236fec1d5cfc85dd3b5679d1b3
author Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Thu Mar 14 00:19:20 2013 -0700
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Fri Mar 15 01:24:57 2013 +0000
tree 7594fe4d3fa5d3c5883ec79b2df4ccc4212f5eb9
parent 61782e4f5eb593958582524aad9b14dc98b1b56c

ASoC: fsi: use snd_soc_register_component() instead of snd_soc_register_dais()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

sound/soc/sh/fsi.c

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index c724026..254c637 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1886,6 +1886,10 @@
 	.pcm_free	= fsi_pcm_free,
 };
 
+static const struct snd_soc_component_driver fsi_soc_component = {
+	.name		= "fsi",
+};
+
 /*
  *		platform function
  */
@@ -2046,10 +2050,10 @@
 		goto exit_fsib;
 	}
 
-	ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
-				    ARRAY_SIZE(fsi_soc_dai));
+	ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component,
+				    fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai));
 	if (ret < 0) {
-		dev_err(&pdev->dev, "cannot snd dai register\n");
+		dev_err(&pdev->dev, "cannot snd component register\n");
 		goto exit_snd_soc;
 	}
 
@@ -2074,7 +2078,7 @@
 
 	pm_runtime_disable(&pdev->dev);
 
-	snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai));
+	snd_soc_unregister_component(&pdev->dev);
 	snd_soc_unregister_platform(&pdev->dev);
 
 	fsi_stream_remove(&master->fsia);