Skip to content

Commit

Permalink
V4L/DVB (13231): pwc: Use kernel's simple_strtol()
Browse files Browse the repository at this point in the history
Change own implementation of pwc_atoi() by simple_strtol(x, NULL, 10).

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Andy Shevchenko authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent e67e376 commit 2d8d776
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions drivers/media/video/pwc/pwc-if.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#endif
#include <linux/vmalloc.h>
#include <asm/io.h>
#include <linux/kernel.h> /* simple_strtol() */

#include "pwc.h"
#include "pwc-kiara.h"
Expand Down Expand Up @@ -1916,19 +1917,6 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
unlock_kernel();
}

/* *grunt* We have to do atoi ourselves :-( */
static int pwc_atoi(const char *s)
{
int k = 0;

k = 0;
while (*s != '\0' && *s >= '0' && *s <= '9') {
k = 10 * k + (*s - '0');
s++;
}
return k;
}


/*
* Initialization code & module stuff
Expand Down Expand Up @@ -2078,13 +2066,16 @@ static int __init usb_pwc_init(void)
}
else {
/* No type or serial number specified, just a number. */
device_hint[i].device_node = pwc_atoi(s);
device_hint[i].device_node =
simple_strtol(s, NULL, 10);
}
}
else {
/* There's a colon, so we have at least a type and a device node */
device_hint[i].type = pwc_atoi(s);
device_hint[i].device_node = pwc_atoi(colon + 1);
device_hint[i].type =
simple_strtol(s, NULL, 10);
device_hint[i].device_node =
simple_strtol(colon + 1, NULL, 10);
if (*dot != '\0') {
/* There's a serial number as well */
int k;
Expand Down

0 comments on commit 2d8d776

Please sign in to comment.