Fixed a few code style issues, particularly:

Add do {} while (0) wrapper around seq_* macros.
Change printk(KERN_WARN...) to netdev_warn(...).

Signed-off-by: Anders Darander <anders.daran...@gmail.com>
---
Changes: 
  v2: * Fix syntax errors (adding missing ; and }).

 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c 
b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
index 2575d0d..e89b5d2 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -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
 
@@ -200,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;
        }
@@ -210,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;
        }
 
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to