]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: soc-core: tidyup strcmp() param on snd_soc_is_matching_dai()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 22 Feb 2024 05:51:11 +0000 (05:51 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 22 Feb 2024 19:49:41 +0000 (19:49 +0000)
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>
Link: https://msgid.link/r/87wmqxjbcg.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index b11b2ca5d939b228fff5151c2371c0f2003fa3e9..507cd3015ff4cd35f6c3ade10d23224c1053e359 100644 (file)
@@ -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 &&