Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp986119pxk; Thu, 10 Sep 2020 04:12:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWHYbWH43Vgfxplh3Sw2w4CaqHucJvaEqZUNQ/0NzvO6UJtDT7AcO1e7LJBkLHUJYPMHXH X-Received: by 2002:a50:fe82:: with SMTP id d2mr8436008edt.86.1599736331389; Thu, 10 Sep 2020 04:12:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599736331; cv=none; d=google.com; s=arc-20160816; b=0QpGfy0p+u2VhbSK291KLtMNAWw/RW5G+DlXk0oZXZVHX66+54LuZjHX6tftsHbdqH t7qyFjgQkXlF+EZGOtLrme/CmuyuXoydTulXNrksKomSPaJGi8g8dle+Zsdmi4Aehd8A j/VMikSEWTIHLdMTKeiNaVUMdmKiQBB32a35rtN4FYzpQq5slwkg0aiD/PMa4e8IAb60 122QSdghaXpT4iH5+DR19IXVRN+tY/K+gyGbQc6H8WmN7xCWmp/Mj+b2uAP/3Df04GXb 93tPik9954ZdK8IPLEMGY13Lpt7cPl8oXDoKM+LL7W2PXxjKdghBCDYk/Lm54A11t1ya 8qcA== 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=7a95nlff+f+a1tENIQ0/09pSeGkZOlzkL4lbVKsE4jE=; b=qqerRBXmaCsIFmwgdGqv2vOldvUqgqqXaQHx6p2tc4c5zplc8WL2t00UAtgaVb7n3q vNEqJ3ePC/oT8ARM9v3KuhGJb010IX4c23Pq0nKTunPinhd7Gi8y+ZTDkG41lRRxuS70 Gb6lhxVdLYxiZUx0njGIFX2Rwzb+ev0+5CjqEs2wTUTC0BiX8KrSfp/yfSL5Dh3wmviQ iLk+kwhze4F4VZ+1fDe2q8YhwNun55DjbeWQFa5pRoqXJyvcTdsAMKSFMaOMZer19z32 jwqap5lQvp1moC2vSrV6GEmkfefBBgH/EYabHrPss8E4QkVP7Sg9jm0AdLIfIp1ktJmL Lf5w== 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 pv7si3179285ejb.753.2020.09.10.04.11.49; Thu, 10 Sep 2020 04:12:11 -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 S1730516AbgIJLJB (ORCPT + 99 others); Thu, 10 Sep 2020 07:09:01 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:12554 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730413AbgIJLGz (ORCPT ); Thu, 10 Sep 2020 07:06:55 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.3]) by rmmx-syy-dmz-app08-12008 (RichMail) with SMTP id 2ee85f5a0899992-8a133; Thu, 10 Sep 2020 19:06:01 +0800 (CST) X-RM-TRANSID: 2ee85f5a0899992-8a133 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[223.112.105.130]) by rmsmtp-syy-appsvr02-12002 (RichMail) with SMTP id 2ee25f5a0896cdb-115c6; Thu, 10 Sep 2020 19:06:01 +0800 (CST) X-RM-TRANSID: 2ee25f5a0896cdb-115c6 From: Tang Bin To: gregkh@linuxfoundation.org, paul@pwsan.com, aaro.koskinen@iki.fi, tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Tang Bin , Zhang Shengju Subject: [PATCH] ARM: OMAP1: clock: Use IS_ERR_OR_NULL() to clean code Date: Thu, 10 Sep 2020 19:06:40 +0800 Message-Id: <20200910110640.4308-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 Use IS_ERR_OR_NULL() to make the code cleaner. Signed-off-by: Zhang Shengju Signed-off-by: Tang Bin --- arch/arm/mach-omap1/clock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index bd5be8210..9d4a0ab50 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -612,7 +612,7 @@ int clk_enable(struct clk *clk) unsigned long flags; int ret; - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return -EINVAL; spin_lock_irqsave(&clockfw_lock, flags); @@ -627,7 +627,7 @@ void clk_disable(struct clk *clk) { unsigned long flags; - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return; spin_lock_irqsave(&clockfw_lock, flags); @@ -650,7 +650,7 @@ unsigned long clk_get_rate(struct clk *clk) unsigned long flags; unsigned long ret; - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return 0; spin_lock_irqsave(&clockfw_lock, flags); @@ -670,7 +670,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate) unsigned long flags; long ret; - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return 0; spin_lock_irqsave(&clockfw_lock, flags); @@ -686,7 +686,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) unsigned long flags; int ret = -EINVAL; - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return ret; spin_lock_irqsave(&clockfw_lock, flags); @@ -791,7 +791,7 @@ void clk_preinit(struct clk *clk) int clk_register(struct clk *clk) { - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return -EINVAL; /* @@ -817,7 +817,7 @@ EXPORT_SYMBOL(clk_register); void clk_unregister(struct clk *clk) { - if (clk == NULL || IS_ERR(clk)) + if (IS_ERR_OR_NULL(clk)) return; mutex_lock(&clocks_mutex); -- 2.20.1.windows.1