forked from luck/tmp_suning_uos_patched
arch/powerpc: replace obsolete strict_strto* calls
Replace strict_strto calls with more appropriate kstrto calls Signed-off-by: Daniel Walter <dwalter@google.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
37028623d7
commit
1618bd53e6
|
@ -149,13 +149,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");
|
||||
|
|
|
@ -977,7 +977,7 @@ static ssize_t viodev_cmo_desired_set(struct device *dev,
|
|||
size_t new_desired;
|
||||
int ret;
|
||||
|
||||
ret = strict_strtoul(buf, 10, &new_desired);
|
||||
ret = kstrtoul(buf, 10, &new_desired);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
|
@ -400,10 +400,10 @@ static int dlpar_online_cpu(struct device_node *dn)
|
|||
static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
|
||||
{
|
||||
struct device_node *dn, *parent;
|
||||
unsigned long drc_index;
|
||||
u32 drc_index;
|
||||
int rc;
|
||||
|
||||
rc = strict_strtoul(buf, 0, &drc_index);
|
||||
rc = kstrtou32(buf, 0, &drc_index);
|
||||
if (rc)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
|
@ -320,7 +320,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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user