ASoC: core: Add devm_snd_soc_register_card()
Subsystems (4)
Mark Brown
maintainerPATCH 1/2 ASoC: core: Add devm_snd_soc_register_card()
From: Mark Brown <[email protected]>
Simplify error handling and remove repetitive (and rarely executed) code for unregistration by providing a devm_snd_soc_register() card.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc.h | 1 + sound/soc/soc-devres.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
include/sound/soc.h +1 -0
@@ -364,6 +364,7 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,int snd_soc_register_card (struct snd_soc_card *card);int snd_soc_unregister_card (struct snd_soc_card *card); +int devm_snd_soc_register_card (struct device *dev,struct snd_soc_card *card);int snd_soc_suspend (struct device *dev);int snd_soc_resume (struct device *dev);int snd_soc_poweroff (struct device *dev);
sound/soc/soc-devres.c +34 -0
@@ -50,3 +50,37 @@ int devm_snd_soc_register_component(struct device *dev,return ret; }EXPORT_SYMBOL_GPL (devm_snd_soc_register_component); + +static void devm_card_release (struct device *dev,void *res) +{ +snd_soc_unregister_card (*(struct snd_soc_card **)res); +} + +/** +* devm_snd_soc_register_card - resource managed card registration +* @dev: Device used to manage card +* @card: Card to register +* +* Register a card with automatic unregistration when the device is +* unregistered. +*/ +int devm_snd_soc_register_card (struct device *dev,struct snd_soc_card *card) +{ +struct device **ptr; +int ret; + + ptr =devres_alloc (devm_card_release,sizeof (*ptr),GFP_KERNEL ); +if (!ptr) +return -ENOMEM ; + + ret =snd_soc_register_card (card); +if (ret ==0 ) { + *ptr = dev; +devres_add (dev, ptr); + }else { +devres_free (ptr); + } + +return ret; +} +EXPORT_SYMBOL_GPL (devm_snd_soc_register_card);
Signature · 1 line
1.8.4.rc3
Mark Brown
maintainerPATCH 2/2 ASoC: smdk_wm8994: Use devm_snd_soc_unregister_card()
From: Mark Brown <[email protected]>
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/samsung/smdk_wm8994.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
sound/soc/samsung/smdk_wm8994.c +1 -11
@@ -193,7 +193,7 @@ static int smdk_audio_probe(struct platform_device *pdev)platform_set_drvdata (pdev, board); - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed:%d\n" , ret);
@@ -201,15 +201,6 @@ static int smdk_audio_probe(struct platform_device *pdev)return ret; } -static int smdk_audio_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card); - -return 0 ; -} -static struct platform_driver smdk_audio_driver = { .driver = { .name ="smdk-audio-wm8894" ,
@@ -217,7 +208,6 @@ static struct platform_driver smdk_audio_driver = { .of_match_table = of_match_ptr(samsung_wm8994_of_match), }, .probe = smdk_audio_probe, - .remove = smdk_audio_remove, };module_platform_driver (smdk_audio_driver);
Signature · 1 line
1.8.4.rc3
Quoted 6 lines · Mark Brown
From: Mark Brown <[email protected]>
Simplify error handling and remove repetitive (and rarely executed) code for unregistration by providing a
devm_snd_soc_register()card.Signed-off-by Mark Brown <[email protected]>
Acked-by Liam Girdwood <[email protected]>