From d93e0a45ca77606ad291325de47a46717cf07b4e Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 21 Mar 2013 03:30:32 -0700 Subject: [PATCH] --- yaml --- r: 371825 b: refs/heads/master c: 426c340853da49e7c55fe856408ea44f8852d8c8 h: refs/heads/master i: 371823: 72e2c91df07645fe4597ab63bfcafae5ab7197a0 v: v3 --- [refs] | 2 +- trunk/sound/soc/cirrus/ep93xx-ac97.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bc10a1c547fc..6db5205aa621 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58309649b4feadea44c5cc3e5d410c34d81ef5d1 +refs/heads/master: 426c340853da49e7c55fe856408ea44f8852d8c8 diff --git a/trunk/sound/soc/cirrus/ep93xx-ac97.c b/trunk/sound/soc/cirrus/ep93xx-ac97.c index 1738d28fb04f..e593c1e4e1dd 100644 --- a/trunk/sound/soc/cirrus/ep93xx-ac97.c +++ b/trunk/sound/soc/cirrus/ep93xx-ac97.c @@ -353,6 +353,10 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = { .ops = &ep93xx_ac97_dai_ops, }; +static const struct snd_soc_component_driver ep93xx_ac97_component = { + .name = "ep93xx-ac97", +}; + static int ep93xx_ac97_probe(struct platform_device *pdev) { struct ep93xx_ac97_info *info; @@ -390,7 +394,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) ep93xx_ac97_info = info; platform_set_drvdata(pdev, info); - ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai); + ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component, + &ep93xx_ac97_dai, 1); if (ret) goto fail; @@ -407,7 +412,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev) { struct ep93xx_ac97_info *info = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); /* disable the AC97 controller */ ep93xx_ac97_write_reg(info, AC97GCR, 0);