From patchwork Mon May 11 14:39:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 192756 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C285FC47255 for ; Mon, 11 May 2020 14:42:43 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 480DE20722 for ; Mon, 11 May 2020 14:42:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="mBoEeN0d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 480DE20722 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7A85515E4; Mon, 11 May 2020 16:41:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7A85515E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1589208161; bh=GXkX9xWSNXY1XODxwBSNeSUjZ5TdYeD5hu+Wk/jwoMA=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mBoEeN0dcYsPZVjx1RjmqO49wHlouNkxJJcPCf84mVEFYdX6c8vRYoFXCj+ee0DXq vCn1OEUHPmI6siMexNrAqRd7otZpRpAh6wbuAWgM3owZXZdNR9wvm9ogMBCnDgFOrJ plzbSSpHJwsaqqhHYitt07h9N0Zow+WGlGtojT88= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A9432F8028E; Mon, 11 May 2020 16:39:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AF0F1F8028C; Mon, 11 May 2020 16:39:46 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1C56FF800B7 for ; Mon, 11 May 2020 16:39:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1C56FF800B7 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5EB4FAF0F for ; Mon, 11 May 2020 14:39:36 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Subject: [PATCH alsa-lib 1/3] pcm: rate: Fix compile warning wrt bit ops and comparison Date: Mon, 11 May 2020 16:39:29 +0200 Message-Id: <20200511143931.31528-2-tiwai@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200511143931.31528-1-tiwai@suse.de> References: <20200511143931.31528-1-tiwai@suse.de> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" We've got a gcc warning: pcm_rate.c: In function ‘snd_pcm_rate_drain’: pcm_rate.c:1090:19: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses] if (pcm->mode & SND_PCM_NONBLOCK != 0) { ^ Drop the zero comparison for fixing the warning and for simplicity. Fixes: 29041c522071 ("fix infinite draining of the rate plugin in SND_PCM_NONBLOCK mode") Signed-off-by: Takashi Iwai --- src/pcm/pcm_rate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 4f99a95b325f..980fa44e4023 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -1087,7 +1087,7 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm) if (rate->last_commit_ptr >= pcm->boundary) rate->last_commit_ptr = 0; } else if (commit_err == 0) { - if (pcm->mode & SND_PCM_NONBLOCK != 0) { + if (pcm->mode & SND_PCM_NONBLOCK) { commit_err = -EAGAIN; break; } From patchwork Mon May 11 14:39:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 192757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E7C4C47255 for ; Mon, 11 May 2020 14:41:30 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 861AC206F5 for ; Mon, 11 May 2020 14:41:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="iS8WRnz1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 861AC206F5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5585A15F2; Mon, 11 May 2020 16:40:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5585A15F2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1589208087; bh=SS4Uxzh2oT0noh8vYu7A7QVgTS9trSBe1+PwLiY6INk=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=iS8WRnz1dRvJy8FYKs57BM/wR0WYpnS78+OImVHhQSURiIL2uxiK1blOLX5rAitny QpKUaf8hcl111zXcLaloTrTDJ9XlSfIMIqhJDRreoPjregKgR6IIstNOgktj/XENaW EcclWRI/e1OLdSWIN7/eqxmzUDfjyeKBkIGQEkoY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 58278F8027B; Mon, 11 May 2020 16:39:45 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 74DA2F8022D; Mon, 11 May 2020 16:39:41 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 23785F80157 for ; Mon, 11 May 2020 16:39:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 23785F80157 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8E461AF13 for ; Mon, 11 May 2020 14:39:36 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Subject: [PATCH alsa-lib 3/3] topology: Add missing ATTRIBUTE_UNUSED Date: Mon, 11 May 2020 16:39:31 +0200 Message-Id: <20200511143931.31528-4-tiwai@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200511143931.31528-1-tiwai@suse.de> References: <20200511143931.31528-1-tiwai@suse.de> X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" ... to shut up the compiler warnings. Fixes: b6c9afb4f59b ("topology: implement snd_tplg_decode") Signed-off-by: Takashi Iwai --- src/topology/pcm.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/topology/pcm.c b/src/topology/pcm.c index 61159d33357c..b15b95045ab5 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -2053,20 +2053,22 @@ next: } /* decode dai from the binary input */ -int tplg_decode_dai(snd_tplg_t *tplg, - size_t pos, - struct snd_soc_tplg_hdr *hdr, - void *bin, size_t size) +int tplg_decode_dai(snd_tplg_t *tplg ATTRIBUTE_UNUSED, + size_t pos ATTRIBUTE_UNUSED, + struct snd_soc_tplg_hdr *hdr ATTRIBUTE_UNUSED, + void *bin ATTRIBUTE_UNUSED, + size_t size ATTRIBUTE_UNUSED) { SNDERR("not implemented"); return -ENXIO; } /* decode cc from the binary input */ -int tplg_decode_cc(snd_tplg_t *tplg, - size_t pos, - struct snd_soc_tplg_hdr *hdr, - void *bin, size_t size) +int tplg_decode_cc(snd_tplg_t *tplg ATTRIBUTE_UNUSED, + size_t pos ATTRIBUTE_UNUSED, + struct snd_soc_tplg_hdr *hdr ATTRIBUTE_UNUSED, + void *bin ATTRIBUTE_UNUSED, + size_t size ATTRIBUTE_UNUSED) { SNDERR("not implemented"); return -ENXIO;