Commit fbd24153 authored by Shuah Khan's avatar Shuah Khan Committed by Ingo Molnar

x86/early_printk: Replace obsolete simple_strtoul() usage with kstrtoint()

Change early_serial_init() to call kstrtoul() instead of calling
obsoleted simple_strtoul().
Signed-off-by: default avatarShuah Khan <shuahkhan@gmail.com>
Cc: Joe Perches <joe@perches.com>
Link: http://lkml.kernel.org/r/1338424803.3569.5.camel@lorien2Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f841d792
...@@ -119,7 +119,7 @@ static __init void early_serial_init(char *s) ...@@ -119,7 +119,7 @@ static __init void early_serial_init(char *s)
unsigned char c; unsigned char c;
unsigned divisor; unsigned divisor;
unsigned baud = DEFAULT_BAUD; unsigned baud = DEFAULT_BAUD;
char *e; ssize_t ret;
if (*s == ',') if (*s == ',')
++s; ++s;
...@@ -127,14 +127,14 @@ static __init void early_serial_init(char *s) ...@@ -127,14 +127,14 @@ static __init void early_serial_init(char *s)
if (*s) { if (*s) {
unsigned port; unsigned port;
if (!strncmp(s, "0x", 2)) { if (!strncmp(s, "0x", 2)) {
early_serial_base = simple_strtoul(s, &e, 16); ret = kstrtoint(s, 16, &early_serial_base);
} else { } else {
static const int __initconst bases[] = { 0x3f8, 0x2f8 }; static const int __initconst bases[] = { 0x3f8, 0x2f8 };
if (!strncmp(s, "ttyS", 4)) if (!strncmp(s, "ttyS", 4))
s += 4; s += 4;
port = simple_strtoul(s, &e, 10); ret = kstrtouint(s, 10, &port);
if (port > 1 || s == e) if (ret || port > 1)
port = 0; port = 0;
early_serial_base = bases[port]; early_serial_base = bases[port];
} }
...@@ -149,8 +149,8 @@ static __init void early_serial_init(char *s) ...@@ -149,8 +149,8 @@ static __init void early_serial_init(char *s)
outb(0x3, early_serial_base + MCR); /* DTR + RTS */ outb(0x3, early_serial_base + MCR); /* DTR + RTS */
if (*s) { if (*s) {
baud = simple_strtoul(s, &e, 0); ret = kstrtouint(s, 0, &baud);
if (baud == 0 || s == e) if (ret || baud == 0)
baud = DEFAULT_BAUD; baud = DEFAULT_BAUD;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment