Change DBG macros to use do-while(0).

Fix white-space.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@545 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/include/linux/can/core.h b/kernel/2.6/include/linux/can/core.h
index 168bafd87078ee21e81706cfce1db84627ab43ae..b295ec1cf2a80b55cdd66efd2500107de383bf97 100644 (file)
--- a/kernel/2.6/include/linux/can/core.h
+++ b/kernel/2.6/include/linux/can/core.h
@@ -72,11 +72,16 @@ extern int can_send(struct sk_buff *skb, int loop);
 #ifdef CONFIG_CAN_DEBUG_CORE
 extern void can_debug_skb(struct sk_buff *skb);
 extern void can_debug_cframe(const char *msg, struct can_frame *cframe);
-#define DBG(fmt, args...)  (DBG_VAR & 1 ? printk( \
-                                       KERN_DEBUG DBG_PREFIX ": %s: " fmt, \
-                                       __func__, ##args) : 0)
-#define DBG_FRAME(fmt, cf) (DBG_VAR & 2 ? can_debug_cframe(fmt, cf) : 0)
-#define DBG_SKB(skb)       (DBG_VAR & 4 ? can_debug_skb(skb) : 0)
+#define DBG(fmt, args...)  \
+       do if (DBG_VAR & 1) printk(KERN_DEBUG DBG_PREFIX ": %s: " fmt, \
+                                  __func__, ##args) : 0);             \
+       while (0)
+
+#define DBG_FRAME(fmt, cf) \
+       do if (DBG_VAR & 2) can_debug_cframe(fmt, cf); while (0)
+
+#define DBG_SKB(skb) \
+       do if (DBG_VAR & 4) can_debug_skb(skb); while (0)
 #else
 #define DBG(fmt, args...)
 #define DBG_FRAME(fmt, cf)

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index a3e45892567e4f6aae07fe6d3e1bab0d1db6f42b..401db186e108b559a8fc8ddd4b0b641410e3cb5c 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -194,7 +194,7 @@ static int can_create(struct socket *sock, int protocol)
                if (err == -ENOSYS) {
                        if (printk_ratelimit())
                                printk(KERN_INFO "can: request_module(%s)"
-                                       " not implemented.\n", module_name);
+                                      " not implemented.\n", module_name);
                } else if (err) {
                        if (printk_ratelimit())
                                printk(KERN_ERR "can: request_module(%s)"