lkml.org 
[lkml]   [2011]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 48/52] kstrtox: convert powerpc
    Date

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    ---
    arch/powerpc/kernel/setup_64.c | 6 +++---
    arch/powerpc/kernel/vio.c | 4 ++--
    arch/powerpc/platforms/pseries/dlpar.c | 4 ++--
    arch/powerpc/platforms/pseries/mobility.c | 2 +-
    arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 8 ++++----
    5 files changed, 12 insertions(+), 12 deletions(-)

    diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
    index 5a0401f..1e05bfc 100644
    --- a/arch/powerpc/kernel/setup_64.c
    +++ b/arch/powerpc/kernel/setup_64.c
    @@ -113,13 +113,13 @@ static void check_smt_enabled(void)
    else if (!strcmp(smt_enabled_cmdline, "off"))
    smt_enabled_at_boot = 0;
    else {
    - long smt;
    + int smt;
    int rc;

    - rc = strict_strtol(smt_enabled_cmdline, 10, &smt);
    + rc = kstrtoint(smt_enabled_cmdline, 10, &smt);
    if (!rc)
    smt_enabled_at_boot =
    - min(threads_per_core, (int)smt);
    + min(threads_per_core, smt);
    }
    } else {
    dn = of_find_node_by_path("/options");
    diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
    index 1b695fd..c69d76f 100644
    --- a/arch/powerpc/kernel/vio.c
    +++ b/arch/powerpc/kernel/vio.c
    @@ -946,10 +946,10 @@ static ssize_t viodev_cmo_desired_set(struct device *dev,
    struct device_attribute *attr, const char *buf, size_t count)
    {
    struct vio_dev *viodev = to_vio_dev(dev);
    - size_t new_desired;
    + unsigned long new_desired;
    int ret;

    - ret = strict_strtoul(buf, 10, &new_desired);
    + ret = kstrtoul(buf, 10, &new_desired);
    if (ret)
    return ret;

    diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
    index b74a923..c8a2e9e 100644
    --- a/arch/powerpc/platforms/pseries/dlpar.c
    +++ b/arch/powerpc/platforms/pseries/dlpar.c
    @@ -403,12 +403,12 @@ out:
    static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
    {
    struct device_node *dn;
    - unsigned long drc_index;
    + u32 drc_index;
    char *cpu_name;
    int rc;

    cpu_hotplug_driver_lock();
    - rc = strict_strtoul(buf, 0, &drc_index);
    + rc = kstrtou32(buf, 0, &drc_index);
    if (rc) {
    rc = -EINVAL;
    goto out;
    diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
    index 3e7f651..5baeb2f 100644
    --- a/arch/powerpc/platforms/pseries/mobility.c
    +++ b/arch/powerpc/platforms/pseries/mobility.c
    @@ -316,7 +316,7 @@ static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
    u64 streamid;
    int rc;

    - rc = strict_strtoull(buf, 0, &streamid);
    + rc = kstrtou64(buf, 0, &streamid);
    if (rc)
    return rc;

    diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
    index cc8d655..d9b8b68 100644
    --- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
    +++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
    @@ -32,9 +32,9 @@ struct mpc85xx_l2ctlr __iomem *l2ctlr;

    static long get_cache_sram_size(void)
    {
    - unsigned long val;
    + unsigned int val;

    - if (!sram_size || (strict_strtoul(sram_size, 0, &val) < 0))
    + if (!sram_size || kstrtouint(sram_size, 0, &val) < 0)
    return -EINVAL;

    return val;
    @@ -42,9 +42,9 @@ static long get_cache_sram_size(void)

    static long get_cache_sram_offset(void)
    {
    - unsigned long val;
    + unsigned int val;

    - if (!sram_offset || (strict_strtoul(sram_offset, 0, &val) < 0))
    + if (!sram_offset || kstrtouint(sram_offset, 0, &val) < 0)
    return -EINVAL;

    return val;
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-02-05 15:45    [W:0.026 / U:0.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site