ASoC: core: Implement devm_snd_soc_register_component()
Subsystems (3)
Mark Brown
maintainerPATCH 1/2 ASoC: core: Implement devm_snd_soc_register_component()
From: Mark Brown <[email protected]>
Since with the wider use of devres many drivers are now only calling snd_soc_unregister_component() in their remove functions providing a managed version will save a reasonable amount of code.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc.h | 3 +++ sound/soc/Makefile | 2 +- sound/soc/soc-devres.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 sound/soc/soc-devres.c
include/sound/soc.h +3 -0
@@ -381,6 +381,9 @@ void snd_soc_unregister_codec(struct device *dev);int snd_soc_register_component (struct device *dev,const struct snd_soc_component_driver *cmpnt_drv,struct snd_soc_dai_driver *dai_drv,int num_dai); +int devm_snd_soc_register_component (struct device *dev, +const struct snd_soc_component_driver *cmpnt_drv, +struct snd_soc_dai_driver *dai_drv,int num_dai);void snd_soc_unregister_component (struct device *dev);int snd_soc_codec_volatile_register (struct snd_soc_codec *codec,unsigned int reg);
sound/soc/Makefile +1 -1
@@ -1,5 +1,5 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o -snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o +snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) snd-soc-core-objs += soc-generic-dmaengine-pcm.o
sound/soc/soc-devres.c new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
Mark Brown
maintainerPATCH 2/2 ASoC: samsung-i2s: Use devm_snd_soc_register_component()
From: Mark Brown <[email protected]>
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/samsung/i2s.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/samsung/i2s.c +6 -6
@@ -1143,9 +1143,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Unable to get drvdata\n" );return -EFAULT ; } -snd_soc_register_component (&sec_dai->pdev->dev, - &samsung_i2s_component, - &sec_dai->i2s_dai_drv,1 ); +devm_snd_soc_register_component (&sec_dai->pdev->dev, + &samsung_i2s_component, + &sec_dai->i2s_dai_drv,1 );samsung_asoc_dma_platform_register (&pdev->dev);return 0 ; }
@@ -1258,8 +1258,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) goto err; } -snd_soc_register_component (&pri_dai->pdev->dev, &samsung_i2s_component, - &pri_dai->i2s_dai_drv,1 ); +devm_snd_soc_register_component (&pri_dai->pdev->dev, + &samsung_i2s_component, + &pri_dai->i2s_dai_drv,1 );pm_runtime_enable (&pdev->dev);
@@ -1294,7 +1295,6 @@ static int samsung_i2s_remove(struct platform_device *pdev) i2s->sec_dai =NULL ;samsung_asoc_dma_platform_unregister (&pdev->dev); -snd_soc_unregister_component (&pdev->dev);return 0 ; }
Signature · 1 line
1.8.4.rc3