aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/nuc900/nuc900-ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:56:56 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:56:56 +0100
commit13419625774f9f3e65e07257ad2a7beb445e9942 (patch)
treee106f4be80e6c8f6cc3be861cd555718a3142ab7 /sound/soc/nuc900/nuc900-ac97.c
parent604c724ba38f6ecc82c9023bee692a7b2fb7e0ee (diff)
parent89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (diff)
downloadkernel_goldelico_gta04-13419625774f9f3e65e07257ad2a7beb445e9942.zip
kernel_goldelico_gta04-13419625774f9f3e65e07257ad2a7beb445e9942.tar.gz
kernel_goldelico_gta04-13419625774f9f3e65e07257ad2a7beb445e9942.tar.bz2
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/nuc900/nuc900-ac97.c')
-rw-r--r--sound/soc/nuc900/nuc900-ac97.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index 0418467..fe3285c 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -314,6 +314,10 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = {
.ops = &nuc900_ac97_dai_ops,
};
+static const struct snd_soc_component_driver nuc900_ac97_component = {
+ .name = "nuc900-ac97",
+};
+
static int nuc900_ac97_drvprobe(struct platform_device *pdev)
{
struct nuc900_audio *nuc900_audio;
@@ -361,7 +365,8 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
nuc900_ac97_data = nuc900_audio;
- ret = snd_soc_register_dai(&pdev->dev, &nuc900_ac97_dai);
+ ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component,
+ &nuc900_ac97_dai, 1);
if (ret)
goto out3;
@@ -384,7 +389,7 @@ out0:
static int nuc900_ac97_drvremove(struct platform_device *pdev)
{
- snd_soc_unregister_dai(&pdev->dev);
+ snd_soc_unregister_component(&pdev->dev);
clk_put(nuc900_ac97_data->clk);
iounmap(nuc900_ac97_data->mmio);