staging: dgap: fix the rest of the checkpatch warnings in dgap.c

This patch fixes all the simple_strtol and simple_strtoul warnings
as reported by checkpatch. After this patch, checkpatch will report
zero errors or warnings on dgap.c.

Signed-off-by: Mark Hounschell <markh@compro.net>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index ace6be7b8986cc1bd0b149136393d6b8f72242f6..a5fc3c75ed4e11343102ab99b6629ae0a2521979 100644 (file)
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -6462,7 +6462,7 @@ static ssize_t dgap_tty_name_show(struct device *d,
                                if (cn != (i + ncount))
                                        continue;
 
-                               return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
+                               return snprintf(buf, PAGE_SIZE, "%s%s%02ld\n",
                                                (un->un_type == DGAP_PRINT) ?
                                                 "pr" : "tty",
                                                cptr->u.conc.id,
@@ -6479,7 +6479,7 @@ static ssize_t dgap_tty_name_show(struct device *d,
                                if (cn != (i + ncount))
                                        continue;
 
-                               return snprintf(buf, PAGE_SIZE, "%s%s%02d\n",
+                               return snprintf(buf, PAGE_SIZE, "%s%s%02ld\n",
                                                (un->un_type == DGAP_PRINT) ?
                                                 "pr" : "tty",
                                                cptr->u.module.id,
@@ -6542,7 +6542,7 @@ static int        dgap_parsefile(char **in, int Remove)
 {
        struct cnode *p, *brd, *line, *conc;
        int     rc;
-       char    *s = NULL, *s2 = NULL;
+       char    *s = NULL;
        int     linecnt = 0;
 
        p = &dgap_head;
@@ -6688,8 +6688,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                return -1;
                        }
                        p->u.board.portstr = dgap_savestring(s);
-                       p->u.board.port = (short)simple_strtol(s, &s2, 0);
-                       if ((short)strlen(s) > (short)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.board.port)) {
                                dgap_err("bad number for IO port");
                                return -1;
                        }
@@ -6707,8 +6706,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                return -1;
                        }
                        p->u.board.addrstr = dgap_savestring(s);
-                       p->u.board.addr = simple_strtoul(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtoul(s, 0, &p->u.board.addr)) {
                                dgap_err("bad number for memory address");
                                return -1;
                        }
@@ -6726,8 +6724,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                return -1;
                        }
                        p->u.board.pcibusstr = dgap_savestring(s);
-                       p->u.board.pcibus = simple_strtoul(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtoul(s, 0, &p->u.board.pcibus)) {
                                dgap_err("bad number for pci bus");
                                return -1;
                        }
@@ -6738,8 +6735,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                return -1;
                        }
                        p->u.board.pcislotstr = dgap_savestring(s);
-                       p->u.board.pcislot = simple_strtoul(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtoul(s, 0, &p->u.board.pcislot)) {
                                dgap_err("bad number for pci slot");
                                return -1;
                        }
@@ -6780,8 +6776,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.board.nport = (char)simple_strtol(s, &s2, 0);
-                               if ((int)strlen(s) > (int)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.board.nport)) {
                                        dgap_err("bad number for number of ports");
                                        return -1;
                                }
@@ -6792,8 +6787,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.conc.nport = (char)simple_strtol(s, &s2, 0);
-                               if ((int)strlen(s) > (int)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.conc.nport)) {
                                        dgap_err("bad number for number of ports");
                                        return -1;
                                }
@@ -6804,8 +6798,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.module.nport = (char)simple_strtol(s, &s2, 0);
-                               if ((int)strlen(s) > (int)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.module.nport)) {
                                        dgap_err("bad number for number of ports");
                                        return -1;
                                }
@@ -6844,8 +6837,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.board.start = simple_strtol(s, &s2, 0);
-                               if ((int)strlen(s) > (int)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.board.start)) {
                                        dgap_err("bad number for start of tty count");
                                        return -1;
                                }
@@ -6856,8 +6848,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.conc.start = simple_strtol(s, &s2, 0);
-                               if ((int)strlen(s) > (int)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.conc.start)) {
                                        dgap_err("bad number for start of tty count");
                                        return -1;
                                }
@@ -6868,8 +6859,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.module.start = simple_strtol(s, &s2, 0);
-                               if ((int)strlen(s) > (int)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.module.start)) {
                                        dgap_err("bad number for start of tty count");
                                        return -1;
                                }
@@ -7051,8 +7041,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.line.speed = (char)simple_strtol(s, &s2, 0);
-                               if ((short)strlen(s) > (short)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.line.speed)) {
                                        dgap_err("bad number for line speed");
                                        return -1;
                                }
@@ -7063,8 +7052,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                        dgap_err("unexpected end of file");
                                        return -1;
                                }
-                               p->u.conc.speed = (char)simple_strtol(s, &s2, 0);
-                               if ((short)strlen(s) > (short)(s2 - s)) {
+                               if (kstrtol(s, 0, &p->u.conc.speed)) {
                                        dgap_err("bad number for line speed");
                                        return -1;
                                }
@@ -7121,8 +7109,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.majornumber = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.majornumber)) {
                                dgap_err("bad number for major number");
                                return -1;
                        }
@@ -7142,8 +7129,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.altpin = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.altpin)) {
                                dgap_err("bad number for altpin");
                                return -1;
                        }
@@ -7163,8 +7149,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.useintr = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.useintr)) {
                                dgap_err("bad number for useintr");
                                return -1;
                        }
@@ -7184,8 +7169,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.ttysize = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.ttysize)) {
                                dgap_err("bad number for ttysize");
                                return -1;
                        }
@@ -7205,8 +7189,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.chsize = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.chsize)) {
                                dgap_err("bad number for chsize");
                                return -1;
                        }
@@ -7226,8 +7209,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.bssize = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.bssize)) {
                                dgap_err("bad number for bssize");
                                return -1;
                        }
@@ -7247,8 +7229,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.unsize = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.unsize)) {
                                dgap_err("bad number for schedsize");
                                return -1;
                        }
@@ -7268,8 +7249,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.f2size = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.f2size)) {
                                dgap_err("bad number for f2200size");
                                return -1;
                        }
@@ -7289,8 +7269,7 @@ static int        dgap_parsefile(char **in, int Remove)
                                dgap_err("unexpected end of file");
                                return -1;
                        }
-                       p->u.vpixsize = simple_strtol(s, &s2, 0);
-                       if ((int)strlen(s) > (int)(s2 - s)) {
+                       if (kstrtol(s, 0, &p->u.vpixsize)) {
                                dgap_err("bad number for vpixsize");
                                return -1;
                        }

diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h
index c8f85096789b39eb21eebe345b946ec96a56fa00..6b8f5f8583272f09ac950ff2a5f7cc07d87711d6 100644 (file)
--- a/drivers/staging/dgap/dgap.h
+++ b/drivers/staging/dgap/dgap.h
@@ -1226,7 +1226,7 @@ struct cnode {
        union {
                struct {
                        char  type;     /* Board Type           */
-                       short port;     /* I/O Address          */
+                       long  port;     /* I/O Address          */
                        char  *portstr; /* I/O Address in string */
                        long  addr;     /* Memory Address       */
                        char  *addrstr; /* Memory Address in string */
@@ -1234,9 +1234,9 @@ struct cnode {
                        char  *pcibusstr; /* PCI BUS in string */
                        long  pcislot;  /* PCI SLOT             */
                        char  *pcislotstr; /* PCI SLOT in string */
-                       char  nport;    /* Number of Ports      */
+                       long  nport;    /* Number of Ports      */
                        char  *id;      /* tty id               */
-                       int   start;    /* start of tty counting */
+                       long  start;    /* start of tty counting */
                        char  *method;  /* Install method       */
                        char  v_type;
                        char  v_port;
@@ -1261,18 +1261,18 @@ struct cnode {
                struct {
                        char  *cable;
                        char  v_cable;
-                       char  speed;
+                       long  speed;
                        char  v_speed;
                } line;
 
                struct {
                        char  type;
                        char  *connect;
-                       char  speed;
-                       char  nport;
+                       long  speed;
+                       long  nport;
                        char  *id;
                        char  *idstr;
-                       int   start;
+                       long  start;
                        char  v_type;
                        char  v_connect;
                        char  v_speed;
@@ -1283,10 +1283,10 @@ struct cnode {
 
                struct {
                        char type;
-                       char nport;
+                       long nport;
                        char *id;
                        char *idstr;
-                       int  start;
+                       long start;
                        char v_type;
                        char v_nport;
                        char v_id;
@@ -1299,23 +1299,23 @@ struct cnode {
 
                char *printname;
 
-               int  majornumber;
+               long majornumber;
 
-               int  altpin;
+               long altpin;
 
-               int  ttysize;
+               long ttysize;
 
-               int  chsize;
+               long chsize;
 
-               int  bssize;
+               long bssize;
 
-               int  unsize;
+               long unsize;
 
-               int  f2size;
+               long f2size;
 
-               int  vpixsize;
+               long vpixsize;
 
-               int  useintr;
+               long useintr;
        } u;
 };