This patch fixes the following errors and warnings:

ft1000_proc.c:26: WARNING: Use #include <linux/io.h> instead of <asm/io.h>
ft1000_proc.c:27: WARNING: Use #include <linux/uaccess.h> instead of 
<asm/uaccess.h>
ft1000_proc.c:33: ERROR: Macros with multiple statements should be enclosed in 
a do - while loop
ft1000_proc.c:40: ERROR: Macros with multiple statements should be enclosed in 
a do - while loop
ft1000_proc.c:49: WARNING: static const char * array should probably be static 
const char * const
ft1000_proc.c:53: WARNING: static const char * array should probably be static 
const char * const

Signed-off-by: Nicolas Thery <nth...@gmail.com>
---
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c 
b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
index 88f6f9c..28a2744 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
@@ -23,34 +23,38 @@
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/netdevice.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 #include "ft1000.h"
 
 #define FT1000_PROC "ft1000"
 #define MAX_FILE_LEN 255
 
-#define seq_putx(m, message, size, var) \
+#define seq_putx(m, message, size, var) 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])
+       seq_printf(m, "%02x\n", var[i]); \
+} while (0)
 
-#define seq_putd(m, message, size, var) \
+#define seq_putd(m, message, size, var) 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])
+       seq_printf(m, "%d\n", var[i]); \
+} while (0)
 
 static int ft1000ReadProc(struct seq_file *m, void *v)
 {
-       static const char *status[] = {
+       static const char * const status[] = {
                "Idle (Disconnect)", "Searching", "Active (Connected)",
                "Waiting for L2", "Sleep", "No Coverage", "", ""
        };
-       static const char *signal[] = { "", "*", "**", "***", "****" };
+       static const char * const signal[] = {
+               "", "*", "**", "***", "****"
+       };
 
        struct net_device *dev = m->private;
        struct ft1000_info *info = netdev_priv(dev);
-- 
1.9.1

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

Reply via email to