drivers: isdn: remove custom strtoul()
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Thu, 15 Jul 2010 02:37:19 +0000 (02:37 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Jul 2010 02:05:25 +0000 (19:05 -0700)
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>
drivers/isdn/hysdn/hysdn_proclog.c

index 7003698e667dc1a16e27c8023e93cbaca406ec46..2ee93d04b2dd688ffd92690e6d4f4a6baaafee0b 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/kernel.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)
 {
        unsigned long u = 0;
-       int found = 0;
-       unsigned char *cp, valbuf[128];
-       long base = 10;
+       int rc;
+       unsigned char valbuf[128];
        hysdn_card *card = file->private_data;
 
        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 */
 
        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')) {
-                       found = 1;
-                       u *= base;      /* adjust to next digit */
-                       u += *cp++ - 'a' + 10;
-                       continue;
-               }
-               break;          /* terminated */
-       }
 
-       if (found) {
+       rc = strict_strtoul(valbuf, 0, &u);
+
+       if (rc == 0) {
                card->debug_flags = u;  /* remember debug flags */
                hysdn_addlog(card, "debug set to 0x%lx", card->debug_flags);
        }