leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: pxa: Convert to devm_snd_soc_register_platform

Browse Source 
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2015-08-27 09:13:46 +08:00 committed by Mark Brown
parent 2cf32b7b33
commit 637c4497bb
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/pxa/mmp-pcm.c
View File

@ -232,13 +232,7 @@ static int mmp_pcm_probe(struct platform_device *pdev)
mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max = mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max =
pdata->period_max_capture; pdata->period_max_capture;
} }
return snd_soc_register_platform(&pdev->dev, &mmp_soc_platform); return devm_snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);
}
static int mmp_pcm_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
} }
static struct platform_driver mmp_pcm_driver = { static struct platform_driver mmp_pcm_driver = {
@ -247,7 +241,6 @@ static struct platform_driver mmp_pcm_driver = {
}, },
.probe = mmp_pcm_probe, .probe = mmp_pcm_probe,
.remove = mmp_pcm_remove,
}; };
module_platform_driver(mmp_pcm_driver); module_platform_driver(mmp_pcm_driver);

9
sound/soc/pxa/pxa2xx-pcm.c
View File

@ -124,13 +124,7 @@ static struct snd_soc_platform_driver pxa2xx_soc_platform = {
static int pxa2xx_soc_platform_probe(struct platform_device *pdev) static int pxa2xx_soc_platform_probe(struct platform_device *pdev)
{ {
return snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform); return devm_snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform);
}
static int pxa2xx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
@ -147,7 +141,6 @@ static struct platform_driver pxa_pcm_driver = {
}, },
.probe = pxa2xx_soc_platform_probe, .probe = pxa2xx_soc_platform_probe,
.remove = pxa2xx_soc_platform_remove,
}; };
module_platform_driver(pxa_pcm_driver); module_platform_driver(pxa_pcm_driver);