From patchwork Wed May 10 14:20:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 760602 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wNJRG59pyz9s86 for ; Thu, 11 May 2017 00:24:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="cMgF9IPC"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 6EB34C21C95; Wed, 10 May 2017 14:23:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D17CFC21D08; Wed, 10 May 2017 14:22:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E6021C21C79; Wed, 10 May 2017 14:22:08 +0000 (UTC) Received: from mail-oi0-f50.google.com (mail-oi0-f50.google.com [209.85.218.50]) by lists.denx.de (Postfix) with ESMTPS id 01931C21CE9 for ; Wed, 10 May 2017 14:22:08 +0000 (UTC) Received: by mail-oi0-f50.google.com with SMTP id h4so37140137oib.3 for ; Wed, 10 May 2017 07:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=wRNGw6M5nGg3e4ynCJ+ktvV49HN6ptkDXWuKe7XNzh8=; b=cMgF9IPCBk8wsasxpjxFXterwqQ1Mx5U7WgDdkN0OaTKFBM2ANpxTFjwgaGFXDWFGX DYCcmVSzFS7wRwjGsWMSOWx4XEoS1J3AiJ0RCwYZ2At+OrLg8mphfqcWj2YasCxhSYV9 7ydDxsTl0SnQfVnjkyWnEN4F65L+AGJBOtaZHLX/i5IV5t89BgKla6ARS2qXQHz88FhK E5c2UA/EBFtQH0rEA2IXDNK4cnO/8JVh//oRr+5hxgOQPriLHHoUe8TolvGHf+8lkWO9 vOB+xtNtM60JBuW18bLu1kmvVhwzoIpgqpB5XWgmsS2Hm1MnUEDFBUAHenXnZnI8rBgn glKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=wRNGw6M5nGg3e4ynCJ+ktvV49HN6ptkDXWuKe7XNzh8=; b=IBePLiDxYTLABpxdGTc0vsiGASYhhYw2nsRfRN9AkgPWro6lC2lZ6fTTAzhO8YXopP OaKk2zwPA8Ne4lK+nvaoLafNh3NQsMQjb1IztsPxw0T8XzuNWGvmSoA8eBRA2HDdABxV JnKgSC/HEobE2H8IT6rwx5p+mLM663XilV5RXi+LigpN9pQQcREJodaIVY73vhvWJvB4 cL+6NLWkp/9v0eeW70alTeJUDObFfT/Q//i//5FEtGODW0ITnX3sNzRNfm/TPOtiNw8A RZ1NDvKklevttHq69VksnolOMVcZNOY8WGLDYMynxWFXX/jJh+ASNe+2IV+F73J3jIpu br9w== X-Gm-Message-State: AODbwcD198kNtI13pEeCnNl6JySxN/1bqCoSfbVYJ/N4pz+7U5g5iZEb njbWAVdXg10XBGwdicvy6Q== X-Received: by 10.202.51.9 with SMTP id z9mr2209242oiz.25.1494426126767; Wed, 10 May 2017 07:22:06 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:11:7d9f:fcbe:ade:4561]) by smtp.gmail.com with ESMTPSA id e46sm1555515otc.17.2017.05.10.07.22.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 07:22:06 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 92A6240550; Wed, 10 May 2017 08:22:05 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 10 May 2017 08:20:41 -0600 Message-Id: <20170510142150.30515-3-sjg@chromium.org> X-Mailer: git-send-email 2.13.0.rc2.291.g57267f2277-goog In-Reply-To: <20170510142150.30515-1-sjg@chromium.org> References: <20170510142150.30515-1-sjg@chromium.org> Cc: Tom Rini , Stephen Warren Subject: [U-Boot] [PATCH v2 02/71] Update WARN_ON() to return a value X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In linux v4.9 this returns a value. This saves checking the warning condition twice in some code. Update the U-Boot version to do this also. Signed-off-by: Simon Glass --- Changes in v2: None include/linux/compat.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index a43e4d6698..03f9bef0da 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -106,8 +106,12 @@ static inline void kmem_cache_destroy(struct kmem_cache *cachep) #define BUG_ON(condition) do { if (condition) BUG(); } while(0) #endif /* BUG */ -#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \ - , __FILE__, __LINE__); } +#define WARN_ON(condition) ({ \ + int __ret_warn_on = !!(condition); \ + if (unlikely(__ret_warn_on)) \ + printf("WARNING in %s line %d\n", __FILE__, __LINE__);; \ + unlikely(__ret_warn_on); \ +}) #define PAGE_SIZE 4096