[PATCH] ASoC: soc-core.c: Do not error if a DAI link component is not found

[PATCH] ASoC: soc-core.c: Do not error if a DAI link component is not found

[Cristian Ciocaltea]

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>
---
 sound/soc/soc-core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a5b96c17633a..cc442c52cdea 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
 	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:
-- 
2.41.0

Re: [PATCH] ASoC: soc-core.c: Do not error if a DAI link component is not found

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 848 bytes --]

On Thu, Aug 24, 2023 at 10:38:37PM +0300, Cristian Ciocaltea wrote:
> 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.

Don't include random extra stuff in patches unless there is substantial
overlap, send one change per patch.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] ASoC: soc-core.c: Do not error if a DAI link component is not found

[Cristian Ciocaltea]

On 8/24/23 23:04, Mark Brown wrote:
> On Thu, Aug 24, 2023 at 10:38:37PM +0300, Cristian Ciocaltea wrote:
>> 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.
> 
> Don't include random extra stuff in patches unless there is substantial
> overlap, send one change per patch.

I submitted v2 with the unrelated changes moved to a separate patch:

https://lore.kernel.org/all/20230824211241.388201-1-cristian.ciocaltea@collabora.com/

Thanks,
Cristian

Re: [PATCH] ASoC: soc-core.c: Do not error if a DAI link component is not found

[Mark Brown]

On Thu, 24 Aug 2023 22:38:37 +0300, Cristian Ciocaltea wrote:
> 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
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: soc-core.c: Do not error if a DAI link component is not found
      commit: 199cd64140f222c66b68ebe288a3fcd0570e2e41

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