aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 03:32:50 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 21:57:20 +0000
commitb1c36861315ce37c2fee8c1c90433068866a8871 (patch)
tree2bb9dd31fdd4b450c3918f4eb0aa058efa6bb22f
parent83d85f53adf38f5021afd921a84efd53c44aff56 (diff)
downloadkernel_goldelico_gta04-b1c36861315ce37c2fee8c1c90433068866a8871.zip
kernel_goldelico_gta04-b1c36861315ce37c2fee8c1c90433068866a8871.tar.gz
kernel_goldelico_gta04-b1c36861315ce37c2fee8c1c90433068866a8871.tar.bz2
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 a263cbe..31a829c 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[] = {
},
};
+static const struct snd_soc_component_driver sst_component = {
+ .name = "sst",
+};
+
/* helper functions */
static inline void sst_set_stream_status(struct sst_runtime_stream *stream,
int state)
@@ -683,7 +687,7 @@ static int sst_platform_probe(struct platform_device *pdev)
return ret;
}
- ret = snd_soc_register_dais(&pdev->dev,
+ ret = snd_soc_register_component(&pdev->dev, &sst_component,
sst_platform_dai, ARRAY_SIZE(sst_platform_dai));
if (ret) {
pr_err("registering cpu dais failed\n");
@@ -695,7 +699,7 @@ static int sst_platform_probe(struct platform_device *pdev)
static int sst_platform_remove(struct platform_device *pdev)
{
- snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
+ snd_soc_unregister_component(&pdev->dev);
snd_soc_unregister_platform(&pdev->dev);
pr_debug("sst_platform_remove success\n");
return 0;