lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kstrtox: convert drivers/isdn/

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan
2011-03-27 02:58:35 +00:00
committed by David S. Miller
parent dffc6b2432
commit 19eccc2bc6
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/isdn/gigaset/ev-layer.c
View File

@@ -390,12 +390,12 @@ static const struct zsau_resp_t {
*/ */
static int cid_of_response(char *s) static int cid_of_response(char *s)
{ {
unsigned long cid; int cid;
int rc; int rc;
if (s[-1] != ';') if (s[-1] != ';')
return 0; /* no CID separator */ return 0; /* no CID separator */
rc = strict_strtoul(s, 10, &cid); rc = kstrtoint(s, 10, &cid);
if (rc) if (rc)
return 0; /* CID not numeric */ return 0; /* CID not numeric */
if (cid < 1 || cid > 65535) if (cid < 1 || cid > 65535)
@@ -566,27 +566,19 @@ void gigaset_handle_modem_response(struct cardstate *cs)
case RT_ZCAU: case RT_ZCAU:
event->parameter = -1; event->parameter = -1;
if (curarg + 1 < params) { if (curarg + 1 < params) {
unsigned long type, value; u8 type, value;
i = strict_strtoul(argv[curarg++], 16, &type); i = kstrtou8(argv[curarg++], 16, &type);
j = strict_strtoul(argv[curarg++], 16, &value); j = kstrtou8(argv[curarg++], 16, &value);
if (i == 0 && j == 0)
if (i == 0 && type < 256 &&
j == 0 && value < 256)
event->parameter = (type << 8) | value; event->parameter = (type << 8) | value;
} else } else
curarg = params - 1; curarg = params - 1;
break; break;
case RT_NUMBER: case RT_NUMBER:
event->parameter = -1; if (curarg >= params ||
if (curarg < params) { kstrtoint(argv[curarg++], 10, &event->parameter))
unsigned long res; event->parameter = -1;
int rc;
rc = strict_strtoul(argv[curarg++], 10, &res);
if (rc == 0)
event->parameter = res;
}
gig_dbg(DEBUG_EVENT, "parameter==%d", event->parameter); gig_dbg(DEBUG_EVENT, "parameter==%d", event->parameter);
break; break;
} }

11
drivers/isdn/hysdn/hysdn_proclog.c
View File

@@ -155,7 +155,6 @@ put_log_buffer(hysdn_card * card, char *cp)
static ssize_t static ssize_t
hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off) hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
{ {
unsigned long u = 0;
int rc; int rc;
unsigned char valbuf[128]; unsigned char valbuf[128];
hysdn_card *card = file->private_data; hysdn_card *card = file->private_data;
@@ -167,12 +166,10 @@ hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t
valbuf[count] = 0; /* terminating 0 */ valbuf[count] = 0; /* terminating 0 */
rc = strict_strtoul(valbuf, 0, &u); rc = kstrtoul(valbuf, 0, &card->debug_flags);
if (rc < 0)
if (rc == 0) { return rc;
card->debug_flags = u; /* remember debug flags */ hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
}
return (count); return (count);
} /* hysdn_log_write */ } /* hysdn_log_write */