Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: switch over to use snd_soc_register_component() on ux500 msp

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:38:19 -07:00 committed by Mark Brown
parent b00e2fa1ab
commit 42277bddc6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/ux500/ux500_msp_dai.c
View File

@ -768,6 +768,11 @@ static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = {
}, },
}; };
static const struct snd_soc_component_driver ux500_msp_component = {
.name = "ux500-msp",
};
static int ux500_msp_drv_probe(struct platform_device *pdev) static int ux500_msp_drv_probe(struct platform_device *pdev)
{ {
struct ux500_msp_i2s_drvdata *drvdata; struct ux500_msp_i2s_drvdata *drvdata;
@ -825,8 +830,8 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
} }
dev_set_drvdata(&pdev->dev, drvdata); dev_set_drvdata(&pdev->dev, drvdata);
ret = snd_soc_register_dai(&pdev->dev, ret = snd_soc_register_component(&pdev->dev, &ux500_msp_component,
&ux500_msp_dai_drv[drvdata->msp->id]); &ux500_msp_dai_drv[drvdata->msp->id], 1);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n", dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n",
__func__, drvdata->msp->id); __func__, drvdata->msp->id);
@ -844,7 +849,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
return 0; return 0;
err_reg_plat: err_reg_plat:
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv)); snd_soc_unregister_component(&pdev->dev);
err_init_msp: err_init_msp:
clk_put(drvdata->clk); clk_put(drvdata->clk);
err_clk: err_clk:
@ -861,7 +866,7 @@ static int ux500_msp_drv_remove(struct platform_device *pdev)
ux500_pcm_unregister_platform(pdev); ux500_pcm_unregister_platform(pdev);
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv)); snd_soc_unregister_component(&pdev->dev);
devm_regulator_put(drvdata->reg_vape); devm_regulator_put(drvdata->reg_vape);
prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s"); prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s");