aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 06:32:50 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 17:57:20 -0400
commitb1c36861315ce37c2fee8c1c90433068866a8871 (patch)
tree2bb9dd31fdd4b450c3918f4eb0aa058efa6bb22f
parent83d85f53adf38f5021afd921a84efd53c44aff56 (diff)
ASoC: switch over to use snd_soc_register_component() on sst
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/mid-x86/sst_platform.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index a263cbed8624..31a829cca5ef 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -165,6 +165,10 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
165}, 165},
166}; 166};
167 167
168static const struct snd_soc_component_driver sst_component = {
169 .name = "sst",
170};
171
168/* helper functions */ 172/* helper functions */
169static inline void sst_set_stream_status(struct sst_runtime_stream *stream, 173static inline void sst_set_stream_status(struct sst_runtime_stream *stream,
170 int state) 174 int state)
@@ -683,7 +687,7 @@ static int sst_platform_probe(struct platform_device *pdev)
683 return ret; 687 return ret;
684 } 688 }
685 689
686 ret = snd_soc_register_dais(&pdev->dev, 690 ret = snd_soc_register_component(&pdev->dev, &sst_component,
687 sst_platform_dai, ARRAY_SIZE(sst_platform_dai)); 691 sst_platform_dai, ARRAY_SIZE(sst_platform_dai));
688 if (ret) { 692 if (ret) {
689 pr_err("registering cpu dais failed\n"); 693 pr_err("registering cpu dais failed\n");
@@ -695,7 +699,7 @@ static int sst_platform_probe(struct platform_device *pdev)
695static int sst_platform_remove(struct platform_device *pdev) 699static int sst_platform_remove(struct platform_device *pdev)
696{ 700{
697 701
698 snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai)); 702 snd_soc_unregister_component(&pdev->dev);
699 snd_soc_unregister_platform(&pdev->dev); 703 snd_soc_unregister_platform(&pdev->dev);
700 pr_debug("sst_platform_remove success\n"); 704 pr_debug("sst_platform_remove success\n");
701 return 0; 705 return 0;