summaryrefslogtreecommitdiff
path: root/sound/soc/spear
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 03:37:00 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 21:57:45 +0000
commita582d44b1352176df012f512124c4395bb60eaf5 (patch)
tree1d35c08e0c629ec196e77ae7f31dd1c26fffb886 /sound/soc/spear
parent73d86d9808ce4885d515a05454a26d5a8533c01a (diff)
downloadlinux-3.10-a582d44b1352176df012f512124c4395bb60eaf5.tar.gz
linux-3.10-a582d44b1352176df012f512124c4395bb60eaf5.tar.bz2
linux-3.10-a582d44b1352176df012f512124c4395bb60eaf5.zip
ASoC: switch over to use snd_soc_register_component() on spear spdif out
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/spear')
-rw-r--r--sound/soc/spear/spdif_out.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index 5eac4cda2fd..1e3c3dda359 100644
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -270,6 +270,10 @@ static struct snd_soc_dai_driver spdif_out_dai = {
.ops = &spdif_out_dai_ops,
};
+static const struct snd_soc_component_driver spdif_out_component = {
+ .name = "spdif-out",
+};
+
static int spdif_out_probe(struct platform_device *pdev)
{
struct spdif_out_dev *host;
@@ -314,7 +318,8 @@ static int spdif_out_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, host);
- ret = snd_soc_register_dai(&pdev->dev, &spdif_out_dai);
+ ret = snd_soc_register_component(&pdev->dev, &spdif_out_component,
+ &spdif_out_dai, 1);
if (ret != 0) {
clk_put(host->clk);
return ret;
@@ -327,7 +332,7 @@ static int spdif_out_remove(struct platform_device *pdev)
{
struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev);
- snd_soc_unregister_dai(&pdev->dev);
+ snd_soc_unregister_component(&pdev->dev);
dev_set_drvdata(&pdev->dev, NULL);
clk_put(host->clk);