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 <[e-mail]>
Tested-by: Mark Hounschell <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

drivers/staging/dgap/dgap.c

···
 				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,
···
 				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,
···
 {
 	struct cnode *p, *brd, *line, *conc;
 	int	rc;
-	char	*s = NULL, *s2 = NULL;
+	char	*s = NULL;
 	int	linecnt = 0;
 
 	p = &dgap_head;
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 					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;
 				}
···
 					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;
 				}
···
 					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;
 				}
···
 					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;
 				}
···
 					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;
 				}
···
 					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;
 				}
···
 					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;
 				}
···
 					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;
 				}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}
···
 				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;
 			}

drivers/staging/dgap/dgap.h

···
 	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 */
···
 			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;
···
 		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;
···
 
 		struct {
 			char type;
-			char nport;
+			long nport;
 			char *id;
 			char *idstr;
-			int  start;
+			long start;
 			char v_type;
 			char v_nport;
 			char v_id;
···
 
 		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;
 };