Skip to contentSkip to conversation

Staging: ft1000-usb: wrap macros in do while

PATCH New Anders Darander 1 participant 2 messages Apr 1, 2014 Staging

lore
Share & tools
lore

Anders Darander

author
#0 lore raw

PATCH 1/1 Staging: ft1000-usb: wrap macros in do while

Fix coding style issue by wrapping the macro in a do {} while (0).

Signed-off-by Anders Darander <[email protected]>
---
 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c +12 -9
index 2575d0d..28f07a7 100644
@@ -32,17 +32,20 @@
 
 
 #define seq_putx(m, message, size, var) \
-	seq_printf(m, message);	\
-	for (i = 0; i < (size - 1); i++) \
-		seq_printf(m, "%02x:", var[i]); \
-	seq_printf(m, "%02x\n", var[i])
+	do { \
+		seq_printf(m, message);	\
+		for (i = 0; i < (size - 1); i++) \
+			seq_printf(m, "%02x:", var[i]); \
+		seq_printf(m, "%02x\n", var[i]);	\
+	} while (0)
 
 #define seq_putd(m, message, size, var) \
-	seq_printf(m, message); \
-	for (i = 0; i < (size - 1); i++) \
-		seq_printf(m, "%d.", var[i]); \
-	seq_printf(m, "%d\n", var[i])
-
+	do { \
+		seq_printf(m, message); \
+		for (i = 0; i < (size - 1); i++) \
+			seq_printf(m, "%d.", var[i]); \
+		seq_printf(m, "%d\n", var[i]);	      \
+	} while (0)
 
 #define FTNET_PROC init_net.proc_net
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 Staging: ft1000-usb: use netdev_warn

Fix coding style issue by replacing printk with netdev_warn.

Signed-off-by Anders Darander <[email protected]>
---
 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c +2 -2
index 28f07a7..e89b5d2 100644
@@ -203,7 +203,7 @@ int ft1000_init_proc(struct net_device *dev)
 
 	info->ft1000_proc_dir = proc_mkdir(FT1000_PROC_DIR, FTNET_PROC);
 	if (info->ft1000_proc_dir == NULL) {
-		printk(KERN_WARNING "Unable to create %s dir.\n",
+		netdev_warn(dev, "Unable to create %s dir.\n",
 			FT1000_PROC_DIR);
 		goto fail;
 	}

@@ -213,7 +213,7 @@ int ft1000_init_proc(struct net_device *dev)
 				 &ft1000_proc_fops, dev);
 
 	if (!ft1000_proc_file) {
-		printk(KERN_WARNING "Unable to create /proc entry.\n");
+		netdev_warn(dev, "Unable to create /proc entry.\n");
 		goto fail_entry;
 	}
Signature · 1 line
1.9.1