From patchwork Wed Apr 23 03:04:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Shen Lim X-Patchwork-Id: 341692 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B91851400AB for ; Wed, 23 Apr 2014 13:06:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753414AbaDWDE4 (ORCPT ); Tue, 22 Apr 2014 23:04:56 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:48486 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751248AbaDWDEz (ORCPT ); Tue, 22 Apr 2014 23:04:55 -0400 Received: by mail-pd0-f172.google.com with SMTP id w10so287187pde.31 for ; Tue, 22 Apr 2014 20:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DAbfvRgmxs9HTBzEJxTaAEkXO6C+2BrGd9ligpROpl0=; b=UbFa2jYq4RsToG6vbIDMKTYYAUNU6atynf/qNjZWF54hZ18HQ1UDDRtWJzSB0hgs+E r0tjFV5RsXTbTqQYuL9mR0xqS8yGC4HpBAtXGMW3cmrNwp/lZPBS5YgWTmNO1RkRb3aY 9qDMqPQ0HO1heqnyS4tZbsSwEYAZM+o57tW8qe7WKL0Wc8umEHChO7nxbl1+VvEfSv7Q 5OWGkeT9MDEzS1LD/wGKshjlBtHNIK5MJ7D9tRdL4QutL/FCXq/FagP48xGoIn5AklCz iL+7A2mpnFk6UzUNkr44wwjx3pF09XllTDBX1eGeIzRA4xom8eHcHoNxyeXnY2U0CVRy e8GA== X-Received: by 10.68.197.99 with SMTP id it3mr49283121pbc.37.1398222294743; Tue, 22 Apr 2014 20:04:54 -0700 (PDT) Received: from gup76.hsd1.ca.comcast.net ([98.234.176.204]) by mx.google.com with ESMTPSA id hw8sm88061211pbc.62.2014.04.22.20.04.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Apr 2014 20:04:54 -0700 (PDT) From: Zi Shen Lim To: Nicolas Pitre Cc: Zi Shen Lim , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Joe Perches Subject: [PATCH] smc91x: improve definition of debug macros Date: Tue, 22 Apr 2014 20:04:42 -0700 Message-Id: <1398222282-8926-1-git-send-email-zlim.lnx@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Redefine some macros that were conditioned upon SMC_DEBUG level. By allowing compiler to verify parameters used by these macros unconditionally, we can flag compilation failures. Compiler will still optimize out the unused code path depending on SMC_DEBUG, so this is a net gain. Signed-off-by: Joe Perches Signed-off-by: Zi Shen Lim --- Note: This patch is based on suggestion by Joe Perches. I added his Signed-off-by as well since I didn't receive an objection. drivers/net/ethernet/smsc/smc91x.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 597909f..bcaa41a 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -147,18 +147,19 @@ MODULE_ALIAS("platform:smc91x"); */ #define MII_DELAY 1 -#if SMC_DEBUG > 0 -#define DBG(n, dev, args...) \ - do { \ - if (SMC_DEBUG >= (n)) \ - netdev_dbg(dev, args); \ +#define DBG(n, dev, fmt, ...) \ + do { \ + if (SMC_DEBUG >= (n)) \ + netdev_dbg(dev, fmt, ##__VA_ARGS__); \ } while (0) -#define PRINTK(dev, args...) netdev_info(dev, args) -#else -#define DBG(n, dev, args...) do { } while (0) -#define PRINTK(dev, args...) netdev_dbg(dev, args) -#endif +#define PRINTK(dev, fmt, ...) \ + do { \ + if (SMC_DEBUG > 0) \ + netdev_info(dev, fmt, ##__VA_ARGS__); \ + else \ + netdev_dbg(dev, fmt, ##__VA_ARGS__); \ + } while (0) #if SMC_DEBUG > 3 static void PRINT_PKT(u_char *buf, int length) @@ -191,7 +192,7 @@ static void PRINT_PKT(u_char *buf, int length) pr_cont("\n"); } #else -#define PRINT_PKT(x...) do { } while (0) +static inline void PRINT_PKT(u_char *buf, int length) { } #endif