Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fc34cc3 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 026240bb

sound/soc/nuc900/nuc900-ac97.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -314,6 +314,10 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = { 
	.ops = &nuc900_ac97_dai_ops,

	.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)

static int nuc900_ac97_drvprobe(struct platform_device *pdev)

{

{

	struct nuc900_audio *nuc900_audio;

	struct nuc900_audio *nuc900_audio;
@@ -361,7 +365,8 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) 




	nuc900_ac97_data = nuc900_audio;

	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)

	if (ret)

		goto out3;

		goto out3;
@@ -384,7 +389,7 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) 




static int nuc900_ac97_drvremove(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);

	clk_put(nuc900_ac97_data->clk);

	iounmap(nuc900_ac97_data->mmio);

	iounmap(nuc900_ac97_data->mmio);