ASoC: soc-core.c: Do not error if a DAI link component is not found
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Thu, 24 Aug 2023 19:38:37 +0000 (22:38 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 24 Aug 2023 20:10:45 +0000 (21:10 +0100)
A recent cleanup of soc_dai_link_sanity_check() is responsible for
generating lots of confusing errors before returning -EPROBE_DEFER:

  acp5x_mach acp5x_mach.0: ASoC: Component acp5x_i2s_dma.0 not found for link acp5x-8821-play
  [...]
  acp5x_mach acp5x_mach.0: ASoC: Component spi-VLV1776:00 not found for link acp5x-CS35L41-Stereo
  [...]
  acp5x_mach acp5x_mach.0: ASoC: Component spi-VLV1776:01 not found for link acp5x-CS35L41-Stereo

Switch back to the initial behaviour of logging those messages on
KERN_DEBUG level instead of KERN_ERR.

While at it, use the correct form of the verb in 'component_not_find'
label.

Fixes: 0e66a2c69409 ("ASoC: soc-core.c: cleanup soc_dai_link_sanity_check()")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com
Link: https://lore.kernel.org/r/20230824193837.369761-1-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org
sound/soc/soc-core.c

index a5b96c1..cc442c5 100644 (file)
@@ -942,7 +942,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
                 * component list.
                 */
                if (!soc_find_component(dlc))
-                       goto component_not_find;
+                       goto component_not_found;
        }
 
        /* Platform check */
@@ -963,7 +963,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
                 * component list.
                 */
                if (!soc_find_component(dlc))
-                       goto component_not_find;
+                       goto component_not_found;
        }
 
        /* CPU check */
@@ -988,7 +988,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
                         * Defer card registration if Component is not added
                         */
                        if (!soc_find_component(dlc))
-                               goto component_not_find;
+                               goto component_not_found;
                }
        }
 
@@ -1002,8 +1002,8 @@ component_empty:
        dev_err(card->dev, "ASoC: Neither Component name/of_node are set for %s\n", link->name);
        return -EINVAL;
 
-component_not_find:
-       dev_err(card->dev, "ASoC: Component %s not found for link %s\n", dlc->name, link->name);
+component_not_found:
+       dev_dbg(card->dev, "ASoC: Component %s not found for link %s\n", dlc->name, link->name);
        return -EPROBE_DEFER;
 
 dai_empty: