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

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

ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 



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

sound/soc/au1x/psc-ac97.c

+7 −2
Original line number Diff line number Diff line
@@ -361,6 +361,10 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = { 
	.ops = &au1xpsc_ac97_dai_ops,

};



static const struct snd_soc_component_driver au1xpsc_ac97_component = {

	.name		= "au1xpsc-ac97",

};



static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)

{

	int ret;
@@ -419,7 +423,8 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, wd);



	ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv);

	ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component,

					 &wd->dai_drv, 1);

	if (ret)

		return ret;
@@ -431,7 +436,7 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev) 
{

	struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);



	snd_soc_unregister_dai(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	/* disable PSC completely */

	au_writel(0, AC97_CFG(wd));