From: Jeffy Chen <jeffy.chen@rock-chips.com> To: linux-kernel@vger.kernel.org, dgreid@chromium.org, heiko@sntech.de Cc: briannorris@chromium.org, mengdong.lin@linux.intel.com, mka@chromium.org, lars@metafoo.de, dianders@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>, Jaroslav Kysela <perex@perex.cz>, alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com> Subject: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Date: Tue, 22 Aug 2017 15:57:21 +0800 [thread overview] Message-ID: <20170822075729.8438-3-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <20170822075729.8438-1-jeffy.chen@rock-chips.com> Currently we are searching dai name in snd_soc_find_dai, which could either be dai driver name or component device name(for legacy naming). Allow searching dai driver name in snd_soc_find_dai too, so that we can use dai driver name to find legacy naming dais. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- Changes in v5: Allow searching for dai driver name in snd_soc_find_dai, instead of hacking non-zero device id to avoid legay dai naming. Changes in v4: None Changes in v3: None Changes in v2: None sound/soc/soc-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 004daaa82102..77e7e2a11af0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -950,7 +950,7 @@ static struct snd_soc_component *soc_find_component( /** * snd_soc_find_dai - Find a registered DAI * - * @dlc: name of the DAI and optional component info to match + * @dlc: name of the DAI or the DAI driver and optional component info to match * * This function will search all registered components and their DAIs to * find the DAI of the same name. The component's of_node and name @@ -978,7 +978,8 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) { - if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) + if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) + && strcmp(dai->driver->name, dlc->dai_name)) continue; return dai; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Jeffy Chen <jeffy.chen@rock-chips.com> To: linux-kernel@vger.kernel.org, dgreid@chromium.org, heiko@sntech.de Cc: alsa-devel@alsa-project.org, mengdong.lin@linux.intel.com, lars@metafoo.de, Liam Girdwood <lgirdwood@gmail.com>, briannorris@chromium.org, Mark Brown <broonie@kernel.org>, Jeffy Chen <jeffy.chen@rock-chips.com>, dianders@chromium.org, mka@chromium.org, Takashi Iwai <tiwai@suse.com> Subject: [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Date: Tue, 22 Aug 2017 15:57:21 +0800 [thread overview] Message-ID: <20170822075729.8438-3-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <20170822075729.8438-1-jeffy.chen@rock-chips.com> Currently we are searching dai name in snd_soc_find_dai, which could either be dai driver name or component device name(for legacy naming). Allow searching dai driver name in snd_soc_find_dai too, so that we can use dai driver name to find legacy naming dais. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- Changes in v5: Allow searching for dai driver name in snd_soc_find_dai, instead of hacking non-zero device id to avoid legay dai naming. Changes in v4: None Changes in v3: None Changes in v2: None sound/soc/soc-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 004daaa82102..77e7e2a11af0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -950,7 +950,7 @@ static struct snd_soc_component *soc_find_component( /** * snd_soc_find_dai - Find a registered DAI * - * @dlc: name of the DAI and optional component info to match + * @dlc: name of the DAI or the DAI driver and optional component info to match * * This function will search all registered components and their DAIs to * find the DAI of the same name. The component's of_node and name @@ -978,7 +978,8 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) { - if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) + if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) + && strcmp(dai->driver->name, dlc->dai_name)) continue; return dai; -- 2.11.0
next prev parent reply other threads:[~2017-08-22 7:58 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-22 7:57 [PATCH v5 0/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 1/9] ASoC: rockchip: Remove obsolete dmic-delay Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 10:32 ` Mark Brown 2017-08-22 10:32 ` Mark Brown 2017-08-22 11:01 ` jeffy 2017-08-22 11:01 ` jeffy 2017-08-22 11:01 ` jeffy 2017-08-22 7:57 ` Jeffy Chen [this message] 2017-08-22 7:57 ` [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Jeffy Chen 2017-08-22 12:47 ` Applied "ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai" to the asoc tree Mark Brown 2017-08-22 12:47 ` Mark Brown 2017-08-22 13:24 ` [PATCH v5 2/9] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai Donglin Peng 2017-08-22 14:02 ` Mark Brown 2017-08-22 14:15 ` Donglin Peng 2017-08-22 14:21 ` Mark Brown 2017-08-22 14:26 ` Takashi Iwai 2017-08-22 14:26 ` Takashi Iwai 2017-08-22 14:31 ` Mark Brown 2017-08-22 14:39 ` jeffy 2017-08-22 14:39 ` jeffy 2017-08-22 7:57 ` [PATCH v5 3/9] ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 4/9] arm64: dts: rockchip: Add rt5514 dsp for Gru Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 5/9] arm64: dts: rockchip: Update rt5514 devices' compatible " Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 6/9] ASoC: rockchip: Parse dai links from dts Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 9:08 ` Donglin Peng 2017-08-22 9:08 ` Donglin Peng 2017-08-22 9:25 ` jeffy 2017-08-22 9:25 ` jeffy 2017-08-22 7:57 ` [PATCH v5 7/9] ASoC: rockchip: Add support for DP codec Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 8/9] ASoC: rockchip: Add support for DMIC codec Jeffy Chen 2017-08-22 7:57 ` Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip,codec Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip, codec Jeffy Chen 2017-08-22 7:57 ` [PATCH v5 9/9] dt-bindings: ASoC: rockchip: Update description of rockchip,codec Jeffy Chen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170822075729.8438-3-jeffy.chen@rock-chips.com \ --to=jeffy.chen@rock-chips.com \ --cc=alsa-devel@alsa-project.org \ --cc=briannorris@chromium.org \ --cc=broonie@kernel.org \ --cc=dgreid@chromium.org \ --cc=dianders@chromium.org \ --cc=heiko@sntech.de \ --cc=lars@metafoo.de \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mengdong.lin@linux.intel.com \ --cc=mka@chromium.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.