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

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

Commit Message

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

   ASoC: atmel_ssc_dai: 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 e14614dc5153ad41f7d1e5b125e4cd155ca79aa2 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <>

Date: Fri, 7 Sep 2018 01:00:15 +0000
Subject: [PATCH] ASoC: atmel_ssc_dai: 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/atmel/atmel_ssc_dai.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index d3b69682d9c2..6291ec7f9dd6 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -1005,11 +1005,11 @@  static int asoc_ssc_init(struct device *dev)
 	struct ssc_device *ssc = dev_get_drvdata(dev);
 	int ret;
-	ret = snd_soc_register_component(dev, &atmel_ssc_component,
+	ret = devm_snd_soc_register_component(dev, &atmel_ssc_component,
 					 &atmel_ssc_dai, 1);
 	if (ret) {
 		dev_err(dev, "Could not register DAI: %d\n", ret);
-		goto err;
+		return ret;
 	if (ssc->pdata->use_dma)
@@ -1019,15 +1019,10 @@  static int asoc_ssc_init(struct device *dev)
 	if (ret) {
 		dev_err(dev, "Could not register PCM: %d\n", ret);
-		goto err_unregister_dai;
+		return ret;
 	return 0;
-	snd_soc_unregister_component(dev);
-	return ret;
 static void asoc_ssc_exit(struct device *dev)
@@ -1038,8 +1033,6 @@  static void asoc_ssc_exit(struct device *dev)
-	snd_soc_unregister_component(dev);