2014-04-19 03:47:44

by Z Lim

Subject: [PATCH] smc91x: fix compile error when SMC_DEBUG >= 2

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.

Signed-off-by: Zi Shen Lim <[email protected]>
---
drivers/net/ethernet/smsc/smc91x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index d1b4dca..597909f 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -1781,7 +1781,7 @@ static int smc_findirq(struct smc_local *lp)
int timeout = 20;
unsigned long cookie;

- DBG(2, dev, "%s: %s\n", CARDNAME, __func__);
+ DBG(2, lp->dev, "%s: %s\n", CARDNAME, __func__);

cookie = probe_irq_on();

--
1.9.1

2014-04-19 04:07:05

by Joe Perches

Subject: Re: [PATCH] smc91x: fix compile error when SMC_DEBUG >= 2

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.
---
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

2014-04-20 01:24:35

by Z Lim

Subject: Re: [PATCH] smc91x: fix compile error when SMC_DEBUG >= 2

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(-)

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

2014-04-23 01:20:33

by David Miller

Subject: Re: [PATCH] smc91x: fix compile error when SMC_DEBUG >= 2

From: Zi Shen Lim <[email protected]>
Date: Fri, 18 Apr 2014 20:47:30 -0700

> 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.
>
> Signed-off-by: Zi Shen Lim <[email protected]>

Applied, thanks.
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?