lkml.org 
[lkml]   [2012]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH RESEND] x86: kernel/early_printk.c simple_strtoul cleanup
    From
    Date
    Change early_serial_init() to call kstrtoul() instead of calling obsoleted
    simple_strtoul().

    Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
    ---
    arch/x86/kernel/early_printk.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
    index 9b9f18b..5e47712 100644
    --- a/arch/x86/kernel/early_printk.c
    +++ b/arch/x86/kernel/early_printk.c
    @@ -119,7 +119,7 @@ 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;
    @@ -127,14 +127,14 @@ static __init void early_serial_init(char *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];
    }
    @@ -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;
    }

    --
    1.7.9.5




    \
     
     \ /
      Last update: 2012-05-31 03:21    [W:0.045 / U:30.408 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site