From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH 6/8] arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON Date: Fri, 14 Dec 2012 10:53:41 -0800 Message-ID: <20121214185340.GJ4989@atomide.com> References: <1351974625-10282-1-git-send-email-Julia.Lawall@lip6.fr> <1351974625-10282-7-git-send-email-Julia.Lawall@lip6.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1351974625-10282-7-git-send-email-Julia.Lawall@lip6.fr> Sender: linux-kernel-owner@vger.kernel.org To: Julia Lawall Cc: kernel-janitors@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-omap@vger.kernel.org * Julia Lawall [121103 13:32]: > From: Julia Lawall > > Just use WARN_ON rather than an if containing only WARN_ON(1). Thanks applying this one into omap-for-v3.8/fixes-for-merge-window. Regards, Tony > A simplified version of the semantic patch that makes this transformation > is as follows: (http://coccinelle.lip6.fr/) > > // > @@ > expression e; > @@ > - if (e) WARN_ON(1); > + WARN_ON(e); > // > > Signed-off-by: Julia Lawall > > --- > arch/arm/mach-omap2/dpll3xxx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c > index eacf51f..ed855b0 100644 > --- a/arch/arm/mach-omap2/dpll3xxx.c > +++ b/arch/arm/mach-omap2/dpll3xxx.c > @@ -478,8 +478,7 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate) > if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) { > freqsel = _omap3_dpll_compute_freqsel(clk, > dd->last_rounded_n); > - if (!freqsel) > - WARN_ON(1); > + WARN_ON(!freqsel); > } > > pr_debug("clock: %s: set rate: locking rate to %lu.\n", >