Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[karo-tx-linux.git] / drivers / net / tehuti.h

diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index 124141909e429d87ef876b1410d53d1b6beb4040..a19dcf8b6b5611632ffb9d1f582c81845046b87c 100644 (file)
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -529,28 +529,34 @@ struct txd_desc {
 
 /* Debugging Macros */
 
-#define ERR(fmt, args...) printk(KERN_ERR fmt, ## args)
-#define DBG2(fmt, args...)     \
-       printk(KERN_ERR  "%s:%-5d: " fmt, __func__, __LINE__, ## args)
+#define DBG2(fmt, args...)                                     \
+       pr_err("%s:%-5d: " fmt, __func__, __LINE__, ## args)
 
 #define BDX_ASSERT(x) BUG_ON(x)
 
 #ifdef DEBUG
 
-#define ENTER          do { \
-       printk(KERN_ERR  "%s:%-5d: ENTER\n", __func__, __LINE__); \
+#define ENTER                                          \
+do {                                                   \
+       pr_err("%s:%-5d: ENTER\n", __func__, __LINE__); \
 } while (0)
 
-#define RET(args...)   do { \
-       printk(KERN_ERR  "%s:%-5d: RETURN\n", __func__, __LINE__); \
-return args; } while (0)
+#define RET(args...)                                    \
+do {                                                    \
+       pr_err("%s:%-5d: RETURN\n", __func__, __LINE__); \
+       return args;                                     \
+} while (0)
 
-#define DBG(fmt, args...)      \
-       printk(KERN_ERR  "%s:%-5d: " fmt, __func__, __LINE__, ## args)
+#define DBG(fmt, args...)                                      \
+       pr_err("%s:%-5d: " fmt, __func__, __LINE__, ## args)
 #else
-#define ENTER         do {  } while (0)
+#define ENTER do {  } while (0)
 #define RET(args...)   return args
-#define DBG(fmt, args...)   do {  } while (0)
+#define DBG(fmt, args...)                      \
+do {                                           \
+       if (0)                                  \
+               pr_err(fmt, ##args);            \
+} while (0)
 #endif
 
 #endif /* _BDX__H */