From nobody Tue Dec 16 21:42:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53AA0C27C40 for ; Thu, 24 Aug 2023 19:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243335AbjHXTjP (ORCPT ); Thu, 24 Aug 2023 15:39:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243442AbjHXTjL (ORCPT ); Thu, 24 Aug 2023 15:39:11 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B324D1FF7 for ; Thu, 24 Aug 2023 12:38:44 -0700 (PDT) Received: from localhost (unknown [81.18.92.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id 4427D6607274; Thu, 24 Aug 2023 20:38:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1692905922; bh=ShbjzuzSvNRLi7HZPR7I5m3AUowqtQJIB0coO7efFes=; h=From:To:Cc:Subject:Date:From; b=bXCzVVRa4paJGN/WL5847HMBA9MLps+OM8opoXmyaf28EL3wyYfJdeoLazNig7iq9 KhM45eB12S9gwOcvg6VpPM+5Dqz4OIA3EnutXSP7YzVd1Rb3u6OkYdgalGxhMePVKm Q9gQVYbqfOvmQ6G8BV2RtW9a1Xj/njv7PWa6gEQvkbqqdDc21Ea8JeqJPVf10CYALw QYoBrkxS4bFkEoWehEd466EDcmPwW4SCLvuES5kGzBHq6mCEDb1UrKCi7S8cTSnQkf pdbThzZgSkXetQrtTe24yPeu/vfrv4cr+ndbLy2KkcLxvAEr0FCIKoXrm4BVh2TqQE 7R3mwV41/EqqA== From: Cristian Ciocaltea To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH] ASoC: soc-core.c: Do not error if a DAI link component is not found Date: Thu, 24 Aug 2023 22:38:37 +0300 Message-ID: <20230824193837.369761-1-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 li= nk acp5x-8821-play [...] acp5x_mach acp5x_mach.0: ASoC: Component spi-VLV1776:00 not found for lin= k acp5x-CS35L41-Stereo [...] acp5x_mach acp5x_mach.0: ASoC: Component spi-VLV1776:01 not found for lin= k 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 --- 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_car= d *card, * component list. */ if (!soc_find_component(dlc)) - goto component_not_find; + goto component_not_found; } =20 /* Platform check */ @@ -963,7 +963,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_car= d *card, * component list. */ if (!soc_find_component(dlc)) - goto component_not_find; + goto component_not_found; } =20 /* CPU check */ @@ -988,7 +988,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_car= d *card, * Defer card registration if Component is not added */ if (!soc_find_component(dlc)) - goto component_not_find; + goto component_not_found; } } =20 @@ -1002,8 +1002,8 @@ static int soc_dai_link_sanity_check(struct snd_soc_c= ard *card, dev_err(card->dev, "ASoC: Neither Component name/of_node are set for %s\n= ", link->name); return -EINVAL; =20 -component_not_find: - dev_err(card->dev, "ASoC: Component %s not found for link %s\n", dlc->nam= e, link->name); +component_not_found: + dev_dbg(card->dev, "ASoC: Component %s not found for link %s\n", dlc->nam= e, link->name); return -EPROBE_DEFER; =20 dai_empty: --=20 2.41.0