Skip to content

Commit

Permalink
EDAC: Replace strict_strtoul() with kstrtoul()
Browse files Browse the repository at this point in the history
The usage of strict_strtoul() is not preferred, because strict_strtoul()
is obsolete. Thus, kstrtoul() should be used.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
  • Loading branch information
Jingoo Han authored and Borislav Petkov committed Jun 8, 2013
1 parent d683b96 commit c7f62fc
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions drivers/edac/amd64_edac_inj.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static ssize_t amd64_inject_section_store(struct device *dev,
unsigned long value;
int ret;

ret = strict_strtoul(data, 10, &value);
ret = kstrtoul(data, 10, &value);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -61,7 +61,7 @@ static ssize_t amd64_inject_word_store(struct device *dev,
unsigned long value;
int ret;

ret = strict_strtoul(data, 10, &value);
ret = kstrtoul(data, 10, &value);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -97,7 +97,7 @@ static ssize_t amd64_inject_ecc_vector_store(struct device *dev,
unsigned long value;
int ret;

ret = strict_strtoul(data, 16, &value);
ret = kstrtoul(data, 16, &value);
if (ret < 0)
return ret;

Expand All @@ -124,7 +124,7 @@ static ssize_t amd64_inject_read_store(struct device *dev,
u32 section, word_bits;
int ret;

ret = strict_strtoul(data, 10, &value);
ret = kstrtoul(data, 10, &value);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -157,7 +157,7 @@ static ssize_t amd64_inject_write_store(struct device *dev,
unsigned long value;
int ret;

ret = strict_strtoul(data, 10, &value);
ret = kstrtoul(data, 10, &value);
if (ret < 0)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/edac_mc_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ static ssize_t mci_sdram_scrub_rate_store(struct device *dev,
unsigned long bandwidth = 0;
int new_bw = 0;

if (strict_strtoul(data, 10, &bandwidth) < 0)
if (kstrtoul(data, 10, &bandwidth) < 0)
return -EINVAL;

new_bw = mci->set_sdram_scrub_rate(mci, bandwidth);
Expand Down
10 changes: 5 additions & 5 deletions drivers/edac/i7core_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ static ssize_t i7core_inject_section_store(struct device *dev,
if (pvt->inject.enable)
disable_inject(mci);

rc = strict_strtoul(data, 10, &value);
rc = kstrtoul(data, 10, &value);
if ((rc < 0) || (value > 3))
return -EIO;

Expand Down Expand Up @@ -741,7 +741,7 @@ struct i7core_pvt *pvt = mci->pvt_info;
if (pvt->inject.enable)
disable_inject(mci);

rc = strict_strtoul(data, 10, &value);
rc = kstrtoul(data, 10, &value);
if ((rc < 0) || (value > 7))
return -EIO;

Expand Down Expand Up @@ -781,7 +781,7 @@ static ssize_t i7core_inject_eccmask_store(struct device *dev,
if (pvt->inject.enable)
disable_inject(mci);

rc = strict_strtoul(data, 10, &value);
rc = kstrtoul(data, 10, &value);
if (rc < 0)
return -EIO;

Expand Down Expand Up @@ -830,7 +830,7 @@ static ssize_t i7core_inject_store_##param( \
if (!strcasecmp(data, "any") || !strcasecmp(data, "any\n"))\
value = -1; \
else { \
rc = strict_strtoul(data, 10, &value); \
rc = kstrtoul(data, 10, &value); \
if ((rc < 0) || (value >= limit)) \
return -EIO; \
} \
Expand Down Expand Up @@ -934,7 +934,7 @@ static ssize_t i7core_inject_enable_store(struct device *dev,
if (!pvt->pci_ch[pvt->inject.channel][0])
return 0;

rc = strict_strtoul(data, 10, &enable);
rc = kstrtoul(data, 10, &enable);
if ((rc < 0))
return 0;

Expand Down
4 changes: 2 additions & 2 deletions drivers/edac/mce_amd_inj.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static ssize_t edac_inject_##reg##_store(struct kobject *kobj, \
int ret = 0; \
unsigned long value; \
\
ret = strict_strtoul(data, 16, &value); \
ret = kstrtoul(data, 16, &value); \
if (ret < 0) \
printk(KERN_ERR "Error writing MCE " #reg " field.\n"); \
\
Expand Down Expand Up @@ -83,7 +83,7 @@ static ssize_t edac_inject_bank_store(struct kobject *kobj,
int ret = 0;
unsigned long value;

ret = strict_strtoul(data, 10, &value);
ret = kstrtoul(data, 10, &value);
if (ret < 0) {
printk(KERN_ERR "Invalid bank value!\n");
return -EINVAL;
Expand Down

0 comments on commit c7f62fc

Please sign in to comment.