| Message ID | 87wmqxjbcg.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b1724c00f0d9224c50a4fab6a85be8e2155a9a1b |
| Headers | show |
| Series | ASoC: soc-core: tidyup strcmp() param on snd_soc_is_matching_dai() | expand |
On Thu, 22 Feb 2024 05:51:11 +0000, Kuninori Morimoto wrote: > snd_soc_is_matching_dai() checks DAI name, which is paired function > with snd_soc_dai_name_get(). > > It checks dlc->dai_name and dai->name (A) or dai->driver_name (B) or > dai->component->name (C) > > static int snd_soc_is_matching_dai(...) > { > ... > if (strcmp(dlc->dai_name, dai->name) == 0) > ~~~~~~~~~~~~~ ^^^^^^^^^(A) > if (... > strcmp(dai->driver->name, dlc->dai_name) == 0) > (B)^^^^^^^^^^^^^^^^ ~~~~~~~~~~~~~ > if (... > strcmp(dlc->dai_name, dai->component->name) == 0) > ~~~~~~~~~~~~~ ^^^^^^^^^^^^^^^^^^(C) > ... > } > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: soc-core: tidyup strcmp() param on snd_soc_is_matching_dai() commit: b1724c00f0d9224c50a4fab6a85be8e2155a9a1b 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
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b11b2ca5d939..507cd3015ff4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -287,7 +287,7 @@ static int snd_soc_is_matching_dai(const struct snd_soc_dai_link_component *dlc, return 1; if (dai->driver->name && - strcmp(dai->driver->name, dlc->dai_name) == 0) + strcmp(dlc->dai_name, dai->driver->name) == 0) return 1; if (dai->component->name &&
snd_soc_is_matching_dai() checks DAI name, which is paired function with snd_soc_dai_name_get(). It checks dlc->dai_name and dai->name (A) or dai->driver_name (B) or dai->component->name (C) static int snd_soc_is_matching_dai(...) { ... if (strcmp(dlc->dai_name, dai->name) == 0) ~~~~~~~~~~~~~ ^^^^^^^^^(A) if (... strcmp(dai->driver->name, dlc->dai_name) == 0) (B)^^^^^^^^^^^^^^^^ ~~~~~~~~~~~~~ if (... strcmp(dlc->dai_name, dai->component->name) == 0) ~~~~~~~~~~~~~ ^^^^^^^^^^^^^^^^^^(C) ... } But (B) part order is different with (A) and (C) (= ^^^^ and ~~~~). This is not a big deal, but confusable to read. Fixup it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)