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

drivers: isdn: remove custom strtoul()

Browse Source 
In this case we safe to use strict_strtoul().

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Shevchenko
2010-07-15 02:37:19 +00:00
committed by David S. Miller
parent 735c65ce4a
commit 3944ad6848
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/kernel.h>
#include "hysdn_defs.h" #include "hysdn_defs.h"
@@ -155,9 +156,8 @@ 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; unsigned long u = 0;
int found = 0; int rc;
unsigned char *cp, valbuf[128]; unsigned char valbuf[128];
long base = 10;
hysdn_card *card = file->private_data; hysdn_card *card = file->private_data;
if (count > (sizeof(valbuf) - 1)) if (count > (sizeof(valbuf) - 1))
@@ -166,32 +166,10 @@ hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t
return (-EFAULT); /* copy failed */ return (-EFAULT); /* copy failed */
valbuf[count] = 0; /* terminating 0 */ valbuf[count] = 0; /* terminating 0 */
cp = valbuf;
if ((count > 2) && (valbuf[0] == '0') && (valbuf[1] == 'x')) {
cp += 2; /* pointer after hex modifier */
base = 16;
}
/* scan the input for debug flags */
while (*cp) {
if ((*cp >= '0') && (*cp <= '9')) {
found = 1;
u *= base; /* adjust to next digit */
u += *cp++ - '0';
continue;
}
if (base != 16)
break; /* end of number */
if ((*cp >= 'a') && (*cp <= 'f')) { rc = strict_strtoul(valbuf, 0, &u);
found = 1;
u *= base; /* adjust to next digit */
u += *cp++ - 'a' + 10;
continue;
}
break; /* terminated */
}
if (found) { if (rc == 0) {
card->debug_flags = u; /* remember debug flags */ 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);
} }