Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1675588ybh; Tue, 14 Jul 2020 04:31:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5efSXCDp70g8F5aitIwndr36TXpG5AzAqQFV2s14vjbRsGBt4ZGaWH5wtXKq924T27q9X X-Received: by 2002:a17:907:94c4:: with SMTP id dn4mr3919407ejc.150.1594726262454; Tue, 14 Jul 2020 04:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594726262; cv=none; d=google.com; s=arc-20160816; b=KeVhcCy0GuLkQXMUTEKuAihstKAB4eI5GEzV0VXD4SGEXk7XXw5FEVm4sxJjNQAlTf 7PYv+JkwufkdU6kXe9C9w7clKVJ2k4ZjlcWfmrBd1+H3n3mFZXX5bntP6k681LFbVdX3 ncOcVI5e2Elt+dXObEjK2jSEFC+AOCHyxgxcLFDa3biMvWV3YB2XlcTFHiIIdxZGExwc 2F/SH7aOxZGoVDgLiINaYddAizYKKG9wEbWMAXFC1uIkUp5LwRj3oNKryqJA1gqjbm0m ovuI7iyrCuY3qv6geVbFDTRrX6AFV/MWyRmlxRrbft9lCgosFMypUXNL1vUIHmJGEQQA xY+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=KHK8ty4922iPxDeQVMMMkJ3TE30TaV3jfRQVDX/B/5I=; b=VQzPlHGtAudEMpEghQ0/7FQhACLT7nwpxAu3HNM7YDqN7fuRtAc5uTFaiak5kDh/6k 3BVX6VA5Sym4EX7XL5KYL8X9eok8jTl1CZklFHE2jWd/gV8KxX8k0uQytS6y8yzrvgVW a0IDi9BxkAhEcjj+7K5aw5AboYZPR367kMyIEX9TG7m2MUa1/SaZcrs7m/o/kLLMpjl4 fjXoxUKPHZSBw0DvfBooJFpVV1eOvf22CH1eg87GkQ6IgmcQ3rM1UCsgWVL53t2JMY4j B7bmJjBGUxsgUTJFW+o8vFryDTiphGcfyihv8xCvQOMqthOlc57UayqiXdJtfBTVsS/F /bxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h11si12354061edn.481.2020.07.14.04.30.38; Tue, 14 Jul 2020 04:31:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727869AbgGNL2F (ORCPT + 99 others); Tue, 14 Jul 2020 07:28:05 -0400 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:51667 "EHLO cmccmta1.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726332AbgGNL2E (ORCPT ); Tue, 14 Jul 2020 07:28:04 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.3]) by rmmx-syy-dmz-app03-12003 (RichMail) with SMTP id 2ee35f0d96a6def-ebf3f; Tue, 14 Jul 2020 19:27:35 +0800 (CST) X-RM-TRANSID: 2ee35f0d96a6def-ebf3f X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[112.25.154.146]) by rmsmtp-syy-appsvr02-12002 (RichMail) with SMTP id 2ee25f0d96a30de-75649; Tue, 14 Jul 2020 19:27:34 +0800 (CST) X-RM-TRANSID: 2ee25f0d96a30de-75649 From: Tang Bin To: broonie@kernel.org, tiwai@suse.com, plai@codeaurora.org, bgoswami@codeaurora.org, perex@perex.cz, lgirdwood@gmail.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Tang Bin , Zhang Shengju Subject: [PATCH] ASoC: qcom: qdsp6: Use IS_ERR() instead of IS_ERR_OR_NULL() Date: Tue, 14 Jul 2020 19:27:44 +0800 Message-Id: <20200714112744.20560-1-tangbin@cmss.chinamobile.com> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the function q6adm_open(), q6adm_alloc_copp() doesn't return NULL. Thus use IS_ERR() to validate the returned value instead of IS_ERR_OR_NULL(). And delete the extra line. Signed-off-by: Zhang Shengju Signed-off-by: Tang Bin --- sound/soc/qcom/qdsp6/q6adm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c index d8069864b..44ac0728f 100644 --- a/sound/soc/qcom/qdsp6/q6adm.c +++ b/sound/soc/qcom/qdsp6/q6adm.c @@ -403,7 +403,7 @@ struct q6copp *q6adm_open(struct device *dev, int port_id, int path, int rate, spin_lock_irqsave(&adm->copps_list_lock, flags); copp = q6adm_alloc_copp(adm, port_id); - if (IS_ERR_OR_NULL(copp)) { + if (IS_ERR(copp)) { spin_unlock_irqrestore(&adm->copps_list_lock, flags); return ERR_CAST(copp); } @@ -419,7 +419,6 @@ struct q6copp *q6adm_open(struct device *dev, int port_id, int path, int rate, copp->bit_width = bit_width; copp->app_type = app_type; - ret = q6adm_device_open(adm, copp, port_id, path, topology, channel_mode, bit_width, rate); if (ret < 0) { -- 2.20.1.windows.1