From patchwork Sun Apr 20 01:24:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zi Shen Lim X-Patchwork-Id: 340509 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 C177D1400E8 for ; Sun, 20 Apr 2014 11:24:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755222AbaDTBYa (ORCPT ); Sat, 19 Apr 2014 21:24:30 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:46162 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754793AbaDTBY2 (ORCPT ); Sat, 19 Apr 2014 21:24:28 -0400 Received: by mail-pd0-f180.google.com with SMTP id v10so2548233pde.25 for ; Sat, 19 Apr 2014 18:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-description:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=cY3eWO2ThS5zFqaxUT1OomD4m6g5+4PB/bG7lSsFPOY=; b=TFPnObd591YMOZPcyAqgUNwFK1QDiUlH5wKDTKl+Z57xS1MYKYti4WPwFQhetJWePI o9nCYyuNGzGGTwoBYEUHj2FM7YddsiMCYImgno96a/m7WDfdnFiQwZZjmUEU6zupmDit VVVndaZmWYNnnwa6QlHYCG7ST8O9TDoOucy9RwRmU1kaYJgn7l818fWfUsYYutL9EB26 VIFnZu3LXy9gL7oFO+KBIrscMrDAN6LzwuyKFpYzNLrZMKadtOHlMdCAmOtOtuGT3P9W PfgsCMtVYW6wpaMiIDbmWppbQ1kDTvDqRgANj4I0zWEeLjbZBakv5bn74z2WVeGdTVfB 2Ydw== X-Received: by 10.66.141.144 with SMTP id ro16mr59059pab.131.1397957067690; Sat, 19 Apr 2014 18:24:27 -0700 (PDT) Received: from gup76 ([2601:9:5d00:2ab:185d:2c75:c126:dacb]) by mx.google.com with ESMTPSA id pr4sm68725693pbb.53.2014.04.19.18.24.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 19 Apr 2014 18:24:27 -0700 (PDT) Date: Sat, 19 Apr 2014 18:24:19 -0700 From: Zi Shen Lim To: Joe Perches Cc: Nicolas Pitre , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] smc91x: fix compile error when SMC_DEBUG >= 2 Message-ID: <20140420012419.GA12770@gup76> References: <1397879250-32041-1-git-send-email-zlim.lnx@gmail.com> <1397880413.3106.2.camel@joe-AO725> MIME-Version: 1.0 Content-Description: Re: [PATCH] smc91x: fix compile error when SMC_DEBUG >= 2 Content-Disposition: inline In-Reply-To: <1397880413.3106.2.camel@joe-AO725> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Joe, On Fri, Apr 18, 2014 at 09:06:53PM -0700, Joe Perches wrote: > On Fri, 2014-04-18 at 20:47 -0700, Zi Shen Lim wrote: > > When SMC_DEBUG >= 2, we hit the following compilation error: > > > > drivers/net/ethernet/smsc/smc91x.c:85:0: > > drivers/net/ethernet/smsc/smc91x.c: In function ‘smc_findirq’: > > drivers/net/ethernet/smsc/smc91x.c:1784:9: error: ‘dev’ undeclared (first use in this function) > > DBG(2, dev, "%s: %s\n", CARDNAME, __func__); > > ^ > > Fix it by passing in the appropriate netdev pointer. > > Perhaps verifying the format and args in all cases > would help avoid more of these in the future. Sounds good. I can add it as the second patch in the series. > --- > drivers/net/ethernet/smsc/smc91x.c | 25 +++++++++++++++---------- > 1 file changed, 15 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c > index d1b4dca..a8302f5 100644 > --- a/drivers/net/ethernet/smsc/smc91x.c > +++ b/drivers/net/ethernet/smsc/smc91x.c > @@ -148,16 +148,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); \ > - } while (0) > - > -#define PRINTK(dev, args...) netdev_info(dev, args) > +#define DBG(n, dev, fmt, ...) \ > +do { \ > + if (SMC_DEBUG >= (n)) \ > + netdev_dbg(dev, fmt, ##__VA_ARGS__); \ > +} while (0) > +#define PRINTK(dev, fmt, ...) netdev_info(dev, fmt, ##__VA_ARGS__) > #else > -#define DBG(n, dev, args...) do { } while (0) > -#define PRINTK(dev, args...) netdev_dbg(dev, args) > +#define DBG(n, dev, fmt, ...) \ > +do { \ > + if (0) \ > + netdev_dbg(dev, fmt, ##__VA_ARGS__); \ > +} while (0) > +#define PRINTK(dev, fmt, ...) netdev_dbg(dev, fmt, ##__VA_ARGS__) > #endif > > #if SMC_DEBUG > 3 > @@ -191,7 +194,9 @@ 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 > How about the following? Ok to add your Signed-off-by as well? Thanks. --- drivers/net/ethernet/smsc/smc91x.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index d1b4dca..796355a 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