Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2672743ybz; Mon, 27 Apr 2020 02:15:28 -0700 (PDT) X-Google-Smtp-Source: APiQypIMvmlaKwDEtbUHOvTGnbzZhOZdIA0vu2v3ttdnU6bIqH0gyK2QxGlM9G+vuIittwjK9Z5d X-Received: by 2002:a17:906:4dc8:: with SMTP id f8mr18902248ejw.23.1587978928446; Mon, 27 Apr 2020 02:15:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587978928; cv=none; d=google.com; s=arc-20160816; b=uhzR2ZlD1oQQzZ6BCfumvlDo5gpQkDJ8UiCkItKCrUK90p5DBCWym4vj6Yt0f+/7NC wsBjcZHaja79/J2rcMtQ/bIO23zoI7ra/PQ4jf/KONtGom+oQBR3eE8o1VB9cpb6knSM yPQyKDUUPK87Ra2QH8H/WgX4XUc5/r55IDeMY0lumTyr+D6Q8m0W9IcRDmMYJtMMcbA4 MfISlCR5/JjjeNqDj+5I7YFCJwTxyDSuqTT7cEL1Mv14m6GSGJgsjq6zi+QqaUfr2w6K O+Qp81hd52dkMjQ/2CWICwE66p4RUBlpJtM55T9NX685UL5KG4QhdOGEPCnMHdVQ+qJT 8+Ig== 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=wlUGakUE1KFtr4WaHHumbkNdLhvrPXpbCJmLTx1yB4s=; b=JBPE5OzIMbGYr8Zx9y49/NyLyy2huPMRYZFdQKN0F0U0YfEUzVON6h6Is+60mORYXn BSvLWFLOKFlZmF/bXZQmUrmO4wKrNUJZCcUKQAqK/pK6+vfmreEBek0++zbVfNapisIJ R8AqammO1tZ4Ai8cWbMvfTpyEcbS9/e8KSsdHbIM/4RuZCWSc09Qai/GCqAlaek4hLVx od5F1EAa7O9fx27f7ade8nJ6YCJYM4XBzb6Fy2Bz4JLhhX5E4GEsCQkIey/DZrJatlRe zDtJFcjudhiO12ZrJd8pEGsqbs0/RMBhST5t8b4rINSP7NZIkWcS4C4K6uiiI98AehYM hjzQ== 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 h10si7561489ejb.380.2020.04.27.02.15.05; Mon, 27 Apr 2020 02:15:28 -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 S1726755AbgD0JLl (ORCPT + 99 others); Mon, 27 Apr 2020 05:11:41 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:49535 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbgD0JLl (ORCPT ); Mon, 27 Apr 2020 05:11:41 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.19]) by rmmx-syy-dmz-app06-12006 (RichMail) with SMTP id 2ee65ea6a1ba977-78abc; Mon, 27 Apr 2020 17:11:22 +0800 (CST) X-RM-TRANSID: 2ee65ea6a1ba977-78abc X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[112.25.154.146]) by rmsmtp-syy-appsvr10-12010 (RichMail) with SMTP id 2eea5ea6a1b738b-77aae; Mon, 27 Apr 2020 17:11:22 +0800 (CST) X-RM-TRANSID: 2eea5ea6a1b738b-77aae From: Tang Bin To: broonie@kernel.org, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Tang Bin , Zhang Shengju Subject: [PATCH] ASoC: hisilicon: Use IS_ERR() instead of IS_ERR_OR_NULL() Date: Mon, 27 Apr 2020 17:11:45 +0800 Message-Id: <20200427091145.4268-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 hi6210_i2s_probe(), devm_clk_get() doesn't return NULL. Thus use IS_ERR() to validate the return value instead of IS_ERR_OR_NULL(). Signed-off-by: Zhang Shengju Signed-off-by: Tang Bin --- sound/soc/hisilicon/hi6210-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index ab3b76d29..f14ce0253 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -570,12 +570,12 @@ static int hi6210_i2s_probe(struct platform_device *pdev) return PTR_ERR(i2s->sysctrl); i2s->clk[CLK_DACODEC] = devm_clk_get(&pdev->dev, "dacodec"); - if (IS_ERR_OR_NULL(i2s->clk[CLK_DACODEC])) + if (IS_ERR(i2s->clk[CLK_DACODEC])) return PTR_ERR(i2s->clk[CLK_DACODEC]); i2s->clocks++; i2s->clk[CLK_I2S_BASE] = devm_clk_get(&pdev->dev, "i2s-base"); - if (IS_ERR_OR_NULL(i2s->clk[CLK_I2S_BASE])) + if (IS_ERR(i2s->clk[CLK_I2S_BASE])) return PTR_ERR(i2s->clk[CLK_I2S_BASE]); i2s->clocks++; -- 2.20.1.windows.1