From patchwork Fri Sep 8 05:27:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 811319 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xpQr538Rdz9s3T for ; Fri, 8 Sep 2017 15:29:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fPFmAEz7"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xpQr51VDyzDql9 for ; Fri, 8 Sep 2017 15:29:57 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fPFmAEz7"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::242; helo=mail-pg0-x242.google.com; envelope-from=nicoleotsuka@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fPFmAEz7"; dkim-atps=neutral Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xpQpQ04bbzDqGV for ; Fri, 8 Sep 2017 15:28:29 +1000 (AEST) Received: by mail-pg0-x242.google.com with SMTP id v82so886132pgb.1 for ; Thu, 07 Sep 2017 22:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=sQDmCRtCkmoIQsKNRiOqTyWmzpBEJJsTS45OaXC71Xw=; b=fPFmAEz7imKRS2WnCQCPFZb7ku/n8+LjVI1NukiLDSlHxqfdWtPtZedWV/68qkng/E eyxs00uauY97FL2KKn2RvMQuyG8NNj2HdhytExhO2KO28BlRGbi0CTv0xjn2RTnreGTu u45gH1X57QvvMnyaUAiKNs0fXMAdMUBe2a+XY0dPuO3YU3iV6QVGTc3xitCj1l0IBIVg 7JiOpGGmfuwksa5pZ6AXCgFasM2k+5VCJ2gZHapOvz0TY2ecjs/UOFDma5VJWCe4pwMa Zr5u2bq62IOzl0DY1jNkye5zIaWeF3fRRsbPPPOUYshBinRCGrzPkCBU+TjSGXC37ELe ZI6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sQDmCRtCkmoIQsKNRiOqTyWmzpBEJJsTS45OaXC71Xw=; b=fjZMSvHI+hFmetTIjBIEq/83B8LSQMJ5hRE1Hg13/07jcP1TcsxtzFWDTogAMn18qE l2Lej6qqauBW1Thk1h0lvdXkI1RhQ3q+4bjO9J61LcSCd3vNC4VKWl4bkFUXmRQjedR0 tjaPPtkvyvToeN92XGTXbolYz4GToE2w5jKp1M/u1HAPZn5ZAWWVga2o1bYQfCcIdQyV Oi0qSXBNm5qc6i90k9bYyjbmpb1z644MStcM4Zw35FOdqbwOJP042l7QXl0VoQnTOsgU k7pOk42k+4G7314E8xtufBbE7DZpcs7M/WfmwMJiSjvU7Bnd0wvPc85GC2ccu+10n3ME 4/uw== X-Gm-Message-State: AHPjjUjR8+0uebkBzHPUIQEtHFY68E1WSWmMNVtbZv/BKcnduNs6CMUa iw5SWECE8w73fw== X-Google-Smtp-Source: ADKCNb61VT2C+CJ0ynkcZQUJrasUDPxNMbvQPzu1QapYI3WXNO5E1wZtdbjmoKg5k4cNKstNLpfx4g== X-Received: by 10.98.204.69 with SMTP id a66mr1947424pfg.132.1504848507682; Thu, 07 Sep 2017 22:28:27 -0700 (PDT) Received: from Asurada-CZ80.localdomain (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id d196sm1703222pfd.102.2017.09.07.22.28.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 22:28:27 -0700 (PDT) From: Nicolin Chen To: broonie@kernel.org Subject: [PATCH] ASoC: fsl-asoc-card: Don't error out if ENOTSUPP Date: Thu, 7 Sep 2017 22:27:33 -0700 Message-Id: <1504848453-9524-1-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, tiwai@suse.com, lgirdwood@gmail.com, perex@perex.cz, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The snd_soc_component_set_sysclk() and snd_soc_dai_set_tdm_slot() in the soc-core.c will return -ENOTSUPP if there is no function implementation for them in the dai and component drivers. So this patch tries to ignore this errno. Signed-off-by: Nicolin Chen --- sound/soc/fsl/fsl-asoc-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 2db4d0c..3772abb 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -166,7 +166,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, cpu_priv->sysclk_id[tx], cpu_priv->sysclk_freq[tx], cpu_priv->sysclk_dir[tx]); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set sysclk for cpu dai\n"); return ret; } @@ -174,7 +174,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, if (cpu_priv->slot_width) { ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, cpu_priv->slot_width); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set TDM slot for cpu dai\n"); return ret; } @@ -270,7 +270,7 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->fll_id, pll_out, SND_SOC_CLOCK_IN); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set SYSCLK: %d\n", ret); return ret; } @@ -283,7 +283,7 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->mclk_id, codec_priv->mclk_freq, SND_SOC_CLOCK_IN); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to switch away from FLL: %d\n", ret); return ret; } @@ -459,7 +459,7 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->mclk_id, codec_priv->mclk_freq, SND_SOC_CLOCK_IN); - if (ret) { + if (ret && ret != -ENOTSUPP) { dev_err(dev, "failed to set sysclk in %s\n", __func__); return ret; }