From patchwork Wed May 18 15:07:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 9120381 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 53349BF29F for ; Wed, 18 May 2016 15:07:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78ECC20351 for ; Wed, 18 May 2016 15:07:31 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4903420340 for ; Wed, 18 May 2016 15:07:28 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A31E6260675; Wed, 18 May 2016 17:07:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8854B26052B; Wed, 18 May 2016 17:07:18 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1259026054D; Wed, 18 May 2016 17:07:17 +0200 (CEST) Received: from webbox1416.server-home.net (webbox1416.server-home.net [77.236.96.61]) by alsa0.perex.cz (Postfix) with ESMTP id ED1A5260526 for ; Wed, 18 May 2016 17:07:09 +0200 (CEST) Received: from imapserver.systec-electronic.com (unknown [212.185.67.146]) by webbox1416.server-home.net (Postfix) with ESMTPA id 8E41027A619; Wed, 18 May 2016 17:07:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by imapserver.systec-electronic.com (Postfix) with ESMTP id 1F233DA0A53; Wed, 18 May 2016 17:07:09 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at imapserver.systec-electronic.com Received: from imapserver.systec-electronic.com ([127.0.0.1]) by localhost (imapserver.systec-electronic.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LVLBrgkrJeM7; Wed, 18 May 2016 17:07:06 +0200 (CEST) Received: from localhost.localdomain (ws-stein.systec.local [192.168.10.117]) by imapserver.systec-electronic.com (Postfix) with ESMTP id 54893DA08E8; Wed, 18 May 2016 17:07:06 +0200 (CEST) From: Alexander Stein To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Date: Wed, 18 May 2016 17:07:00 +0200 Message-Id: <1463584020-6085-1-git-send-email-alexander.stein@systec-electronic.com> X-Mailer: git-send-email 2.7.3 Cc: alsa-devel@alsa-project.org, Ricard Wanderlof , Alexander Stein Subject: [alsa-devel] [PATCH v2 1/1] ASoC: core: Do not print an actual error when deferring probe X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP In case there is no DAI (yet), do not print an error, this might happen a lot of times. Print a notice instead. Signed-off-by: Alexander Stein Acked-by: Ricard Wanderlof --- Changes in v2: * Add addional change in soc_bind_aux_dev() sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d2e62b15..ce5f835 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1001,7 +1001,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, cpu_dai_component.dai_name = dai_link->cpu_dai_name; rtd->cpu_dai = snd_soc_find_dai(&cpu_dai_component); if (!rtd->cpu_dai) { - dev_err(card->dev, "ASoC: CPU DAI %s not registered\n", + dev_notice(card->dev, "ASoC: CPU DAI %s not registered\n", dai_link->cpu_dai_name); goto _err_defer; } @@ -1013,7 +1013,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, for (i = 0; i < rtd->num_codecs; i++) { codec_dais[i] = snd_soc_find_dai(&codecs[i]); if (!codec_dais[i]) { - dev_err(card->dev, "ASoC: CODEC DAI %s not registered\n", + dev_notice(card->dev, "ASoC: CODEC DAI %s not registered\n", codecs[i].dai_name); goto _err_defer; } @@ -1042,7 +1042,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, rtd->platform = platform; } if (!rtd->platform) { - dev_err(card->dev, "ASoC: platform %s not registered\n", + dev_notice(card->dev, "ASoC: platform %s not registered\n", dai_link->platform_name); return -EPROBE_DEFER; } @@ -1698,7 +1698,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) return 0; err_defer: - dev_err(card->dev, "ASoC: %s not registered\n", name); + dev_notice(card->dev, "ASoC: %s not registered\n", name); return -EPROBE_DEFER; }