Skip to content

Commit

Permalink
x86/early_printk: Replace obsolete simple_strtoul() usage with kstrto…
Browse files Browse the repository at this point in the history
…int()

Change early_serial_init() to call kstrtoul() instead of calling
obsoleted simple_strtoul().

Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
Cc: Joe Perches <joe@perches.com>
Link: http://lkml.kernel.org/r/1338424803.3569.5.camel@lorien2
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Shuah Khan authored and Ingo Molnar committed Jun 6, 2012
1 parent f841d79 commit fbd2415
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/x86/kernel/early_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,22 @@ static __init void early_serial_init(char *s)
unsigned char c;
unsigned divisor;
unsigned baud = DEFAULT_BAUD;
char *e;
ssize_t ret;

if (*s == ',')
++s;

if (*s) {
unsigned port;
if (!strncmp(s, "0x", 2)) {
early_serial_base = simple_strtoul(s, &e, 16);
ret = kstrtoint(s, 16, &early_serial_base);
} else {
static const int __initconst bases[] = { 0x3f8, 0x2f8 };

if (!strncmp(s, "ttyS", 4))
s += 4;
port = simple_strtoul(s, &e, 10);
if (port > 1 || s == e)
ret = kstrtouint(s, 10, &port);
if (ret || port > 1)
port = 0;
early_serial_base = bases[port];
}
Expand All @@ -149,8 +149,8 @@ static __init void early_serial_init(char *s)
outb(0x3, early_serial_base + MCR); /* DTR + RTS */

if (*s) {
baud = simple_strtoul(s, &e, 0);
if (baud == 0 || s == e)
ret = kstrtouint(s, 0, &baud);
if (ret || baud == 0)
baud = DEFAULT_BAUD;
}

Expand Down

0 comments on commit fbd2415

Please sign in to comment.