diff mbox series

Applied "ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()" to the asoc tree

Message ID E1elx7l-000732-Vs@debutante
State Accepted
Commit 0e7b25c673ec916dee8d927fc8de5806d900cba8
Headers show
Series Applied "ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()" to the asoc tree | expand

Commit Message

Mark Brown Feb. 14, 2018, 1:29 p.m. UTC 
The patch

   ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

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.

Thanks,
Mark

From a8768c52c511e92d9c9816cecaec4bca77da8a89 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Date: Wed, 14 Feb 2018 02:56:36 +0000
Subject: [PATCH] ASoC: soc-core: remove legacy_dai_naming from
 snd_soc_register_dais()

We can get legacy dai name flag from component driver.
Thus, there is no need to have its parameter on snd_soc_register_dais().
Let's remove unneeded parameter

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Mark Brown <broonie@kernel.org>

---
 sound/soc/soc-core.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

-- 
2.16.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Comments

Kuninori Morimoto Feb. 15, 2018, 2:36 a.m. UTC | #1 
Hi Mark

> The patch

> 

>    ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()

> 

> has been applied to the asoc tree at

> 

>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 


Thank you for accepting this patch.
But I noticed this patch might be issue if codec/platform conversion
patch were merged. For example Codec was converted, but Platform was not yet.
It breaks git-bisect. I'm sorry this is my fault.

This patch should be applied if all codec/platform code were removed
(Actually it was in my local environment).
Is it possible to reassemble and force-update on mark/topic/core ?
Of course I can post revert patch.
But reassemble is reasonable to avoid git-bisect.

-----------------------------------------
commit a8768c52c511e92d9c9816cecaec4bca77da8a89
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Wed Feb 14 02:56:36 2018 +0000

    ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()
    
    We can get legacy dai name flag from component driver.
    Thus, there is no need to have its parameter on snd_soc_register_dais().
    Let's remove unneeded parameter
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    Signed-off-by: Mark Brown <broonie@kernel.org>

-----------------------------------------


Best regards
---
Kuninori Morimoto
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
diff mbox series

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 574048a73b1c..b928c59ea775 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3150,8 +3150,7 @@  static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,
  *                     parent's name.
  */
 static int snd_soc_register_dais(struct snd_soc_component *component,
-	struct snd_soc_dai_driver *dai_drv, size_t count,
-	bool legacy_dai_naming)
+				 struct snd_soc_dai_driver *dai_drv, size_t count)
 {
 	struct device *dev = component->dev;
 	struct snd_soc_dai *dai;
@@ -3163,7 +3162,7 @@  static int snd_soc_register_dais(struct snd_soc_component *component,
 	for (i = 0; i < count; i++) {
 
 		dai = soc_add_dai(component, dai_drv + i,
-				count == 1 && legacy_dai_naming);
+				  count == 1 && !component->driver->non_legacy_dai_naming);
 		if (dai == NULL) {
 			ret = -ENOMEM;
 			goto err;
@@ -3444,8 +3443,7 @@  int snd_soc_add_component(struct device *dev,
 		}
 	}
 
-	ret = snd_soc_register_dais(component, dai_drv, num_dai,
-				    !component_driver->non_legacy_dai_naming);
+	ret = snd_soc_register_dais(component, dai_drv, num_dai);
 	if (ret < 0) {
 		dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret);
 		goto err_cleanup;