From: Nicolas Thery <nthery@gmail.com>
To: marek.belisko@gmail.com, gregkh@linuxfoundation.org, me@aldo.io
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
nthery@gmail.com
Subject: [PATCH] staging: ft1000: fix some checkpatch complaints
Date: Sun, 27 Jul 2014 19:08:33 +0200 [thread overview]
Message-ID: <1406480913-31378-1-git-send-email-nthery@gmail.com> (raw)
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 <nthery@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
next reply other threads:[~2014-07-27 17:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-27 17:08 Nicolas Thery [this message]
2014-07-27 17:23 ` [PATCH] staging: ft1000: fix some checkpatch complaints Joe Perches
2014-07-27 17:35 ` Greg KH
2014-07-27 17:40 ` Joe Perches
2014-07-27 17:40 ` Nicolas Thery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406480913-31378-1-git-send-email-nthery@gmail.com \
--to=nthery@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.belisko@gmail.com \
--cc=me@aldo.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox