evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2013-03-21 03:35:33 -07:00 • committed by Mark Brown
parent eca3b01d08
commit 6d717f3ef5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/samsung/ac97.c
View file

@ -370,6 +370,10 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = {
}, },
}; };
static const struct snd_soc_component_driver s3c_ac97_component = {
.name = "s3c-ac97",
};
static int s3c_ac97_probe(struct platform_device *pdev) static int s3c_ac97_probe(struct platform_device *pdev)
{ {
struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res; struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res;
@ -457,8 +461,8 @@ static int s3c_ac97_probe(struct platform_device *pdev)
goto err4; goto err4;
} }
ret = snd_soc_register_dais(&pdev->dev, s3c_ac97_dai, ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
ARRAY_SIZE(s3c_ac97_dai)); s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
if (ret) if (ret)
goto err5; goto err5;
@ -470,7 +474,7 @@ static int s3c_ac97_probe(struct platform_device *pdev)
return 0; return 0;
err6: err6:
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai)); snd_soc_unregister_component(&pdev->dev);
err5: err5:
free_irq(irq_res->start, NULL); free_irq(irq_res->start, NULL);
err4: err4:
@ -490,7 +494,7 @@ static int s3c_ac97_remove(struct platform_device *pdev)
struct resource *mem_res, *irq_res; struct resource *mem_res, *irq_res;
asoc_dma_platform_unregister(&pdev->dev); asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai)); snd_soc_unregister_component(&pdev->dev);
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (irq_res) if (irq_res)