Skip to content

Commit

Permalink
ASoC: switch over to use snd_soc_register_component() on nuc900 ac97
Browse files Browse the repository at this point in the history 
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 26, 2013
1 parent 026240b commit 7fc34cc
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions sound/soc/nuc900/nuc900-ac97.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -384,7 +389,7 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)

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);
Expand Down

0 comments on commit 7fc34cc

Please sign in to comment.