Applied "ASoC: omap: use devm_snd_soc_register_component()" to the asoc tree

Message ID
State Superseded
Headers show
  • Applied "ASoC: omap: use devm_snd_soc_register_component()" to the asoc tree
Related show

Commit Message

Mark Brown Sept. 10, 2018, 2:21 p.m.
The patch

   ASoC: omap: use devm_snd_soc_register_component()

has been applied to the asoc tree at 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.


From 642a722d3116fbd22e59ac027f81b5ecd285f17c Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <>

Date: Fri, 7 Sep 2018 01:02:54 +0000
Subject: [PATCH] ASoC: omap: use devm_snd_soc_register_component()

Now we have devm_snd_soc_register_component().
Let's use it instead of snd_soc_register_component().

Signed-off-by: Kuninori Morimoto <>

Signed-off-by: Mark Brown <>

 sound/soc/omap/omap-hdmi-audio.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 8a99a8837dc9..673a9eb153b2 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -348,7 +348,7 @@  static int omap_hdmi_audio_probe(struct platform_device *pdev)
 		return -EINVAL;
-	ret = snd_soc_register_component(ad->dssdev, &omap_hdmi_component,
+	ret = devm_snd_soc_register_component(ad->dssdev, &omap_hdmi_component,
 					 dai_drv, 1);
 	if (ret)
 		return ret;
@@ -383,7 +383,6 @@  static int omap_hdmi_audio_probe(struct platform_device *pdev)
 	ret = snd_soc_register_card(card);
 	if (ret) {
 		dev_err(dev, "snd_soc_register_card failed (%d)\n", ret);
-		snd_soc_unregister_component(ad->dssdev);
 		return ret;
@@ -400,7 +399,6 @@  static int omap_hdmi_audio_remove(struct platform_device *pdev)
 	struct hdmi_audio_data *ad = platform_get_drvdata(pdev);
-	snd_soc_unregister_component(ad->dssdev);
 	return 0;