[PATCH v2 34/96] ASoC: core: Switch core to new DAI naming flag

From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>
Cc: <lgirdwood@gmail.com>, <kuninori.morimoto.gx@renesas.com>,
	<mripard@kernel.org>, <airlied@linux.ie>, <daniel@ffwll.ch>,
	<vkoul@kernel.org>, <nicolas.ferre@microchip.com>,
	<nsaenz@kernel.org>, <shawnguo@kernel.org>, <linux-imx@nxp.com>,
	<cezary.rojewski@intel.com>,
	<pierre-louis.bossart@linux.intel.com>,
	<linux-mips@vger.kernel.org>, <linux-amlogic@lists.infradead.org>,
	<daniel@zonque.org>, <srinivas.kandagatla@linaro.org>,
	<linux-rockchip@lists.infradead.org>, <krzk@kernel.org>,
	<linux-stm32@st-md-mailman.stormreply.com>,
	<linux-sunxi@lists.linux.dev>, <linux-tegra@vger.kernel.org>,
	<linux-omap@vger.kernel.org>, <linux-xtensa@linux-xtensa.org>,
	<peter.ujfalusi@gmail.com>, <jarkko.nikula@bitmer.com>,
	<heiko@sntech.de>, <jbrunet@baylibre.com>,
	<kernel@pengutronix.de>, <alsa-devel@alsa-project.org>,
	<patches@opensource.cirrus.com>,
	<dri-devel@lists.freedesktop.org>,
	<linux-rpi-kernel@lists.infradead.org>,
	<frattaroli.nicolas@gmail.com>
Subject: [PATCH v2 34/96] ASoC: core: Switch core to new DAI naming flag
Date: Thu, 23 Jun 2022 13:51:48 +0100	[thread overview]
Message-ID: <20220623125250.2355471-35-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20220623125250.2355471-1-ckeepax@opensource.cirrus.com>

Now all the drivers are updated to have the new legacy_dai_naming
flag, update the core code so it also uses the new flag. Paving
the way for the old non_legacy_dai_naming flag to be removed.

It should be noted this patch will affect the CODEC drivers that don't
specify the non_legacy_dai_naming flag. These drivers will update from
using legacy DAI naming to the new scheme after this patch, this is
being considered a fix as the intention was for all CODEC drivers to use
the new scheme and all existing CODEC drivers were updated to do so
before componentisation. This just corrects those devices that have
snuck in since componentisation. The corrected devices are as
follows:

adau1372, cros_ec_codec, cs35l41, cs35l45, cx2072x, hdac_hda,
jz4725/60/70, lpass-rx/tx/va/wsa-macro, max98504, max9877,
mt6351/58/59, mt6660, pcm3060, rk3328, rt1308/16, rt5514,
rt5677, rt700/11/15, rt9120, sdw-mockup, tlv320adc3xxx, tscs454,
wcd9335/4x/8x, wsa881x

Some of these devices are used in some in kernel machine drivers,
however it appears all the usages use the actual DAI driver name
(since snd_soc_find_dai checks both the DAI name and the DAI driver
name). So it is not believed this change will break any in tree
machine drivers.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 sound/soc/soc-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 30f0da711ca95..60e21b06b1dcb 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2488,7 +2488,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
 
 	for (i = 0; i < count; i++) {
 		dai = snd_soc_register_dai(component, dai_drv + i, count == 1 &&
-					   !component->driver->non_legacy_dai_naming);
+					   component->driver->legacy_dai_naming);
 		if (dai == NULL) {
 			ret = -ENOMEM;
 			goto err;
-- 
2.30.2


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
