aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/edac/amd64_edac_inj.c10
-rw-r--r--drivers/edac/edac_mc_sysfs.c2
-rw-r--r--drivers/edac/i7core_edac.c10
-rw-r--r--drivers/edac/mce_amd_inj.c4
4 files changed, 13 insertions, 13 deletions
diff --git a/drivers/edac/amd64_edac_inj.c b/drivers/edac/amd64_edac_inj.c
index 845f04786c2d..0d66ae68d468 100644
--- a/drivers/edac/amd64_edac_inj.c
+++ b/drivers/edac/amd64_edac_inj.c
@@ -24,7 +24,7 @@ static ssize_t amd64_inject_section_store(struct device *dev,
24 unsigned long value; 24 unsigned long value;
25 int ret; 25 int ret;
26 26
27 ret = strict_strtoul(data, 10, &value); 27 ret = kstrtoul(data, 10, &value);
28 if (ret < 0) 28 if (ret < 0)
29 return ret; 29 return ret;
30 30
@@ -61,7 +61,7 @@ static ssize_t amd64_inject_word_store(struct device *dev,
61 unsigned long value; 61 unsigned long value;
62 int ret; 62 int ret;
63 63
64 ret = strict_strtoul(data, 10, &value); 64 ret = kstrtoul(data, 10, &value);
65 if (ret < 0) 65 if (ret < 0)
66 return ret; 66 return ret;
67 67
@@ -97,7 +97,7 @@ static ssize_t amd64_inject_ecc_vector_store(struct device *dev,
97 unsigned long value; 97 unsigned long value;
98 int ret; 98 int ret;
99 99
100 ret = strict_strtoul(data, 16, &value); 100 ret = kstrtoul(data, 16, &value);
101 if (ret < 0) 101 if (ret < 0)
102 return ret; 102 return ret;
103 103
@@ -124,7 +124,7 @@ static ssize_t amd64_inject_read_store(struct device *dev,
124 u32 section, word_bits; 124 u32 section, word_bits;
125 int ret; 125 int ret;
126 126
127 ret = strict_strtoul(data, 10, &value); 127 ret = kstrtoul(data, 10, &value);
128 if (ret < 0) 128 if (ret < 0)
129 return ret; 129 return ret;
130 130
@@ -157,7 +157,7 @@ static ssize_t amd64_inject_write_store(struct device *dev,
157 unsigned long value; 157 unsigned long value;
158 int ret; 158 int ret;
159 159
160 ret = strict_strtoul(data, 10, &value); 160 ret = kstrtoul(data, 10, &value);
161 if (ret < 0) 161 if (ret < 0)
162 return ret; 162 return ret;
163 163
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 67610a6ebf87..ef15a7e613bc 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -678,7 +678,7 @@ static ssize_t mci_sdram_scrub_rate_store(struct device *dev,
678 unsigned long bandwidth = 0; 678 unsigned long bandwidth = 0;
679 int new_bw = 0; 679 int new_bw = 0;
680 680
681 if (strict_strtoul(data, 10, &bandwidth) < 0) 681 if (kstrtoul(data, 10, &bandwidth) < 0)
682 return -EINVAL; 682 return -EINVAL;
683 683
684 new_bw = mci->set_sdram_scrub_rate(mci, bandwidth); 684 new_bw = mci->set_sdram_scrub_rate(mci, bandwidth);
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 0ec3e95a12cd..80a963d64e58 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -704,7 +704,7 @@ static ssize_t i7core_inject_section_store(struct device *dev,
704 if (pvt->inject.enable) 704 if (pvt->inject.enable)
705 disable_inject(mci); 705 disable_inject(mci);
706 706
707 rc = strict_strtoul(data, 10, &value); 707 rc = kstrtoul(data, 10, &value);
708 if ((rc < 0) || (value > 3)) 708 if ((rc < 0) || (value > 3))
709 return -EIO; 709 return -EIO;
710 710
@@ -741,7 +741,7 @@ struct i7core_pvt *pvt = mci->pvt_info;
741 if (pvt->inject.enable) 741 if (pvt->inject.enable)
742 disable_inject(mci); 742 disable_inject(mci);
743 743
744 rc = strict_strtoul(data, 10, &value); 744 rc = kstrtoul(data, 10, &value);
745 if ((rc < 0) || (value > 7)) 745 if ((rc < 0) || (value > 7))
746 return -EIO; 746 return -EIO;
747 747
@@ -781,7 +781,7 @@ static ssize_t i7core_inject_eccmask_store(struct device *dev,
781 if (pvt->inject.enable) 781 if (pvt->inject.enable)
782 disable_inject(mci); 782 disable_inject(mci);
783 783
784 rc = strict_strtoul(data, 10, &value); 784 rc = kstrtoul(data, 10, &value);
785 if (rc < 0) 785 if (rc < 0)
786 return -EIO; 786 return -EIO;
787 787
@@ -830,7 +830,7 @@ static ssize_t i7core_inject_store_##param( \
830 if (!strcasecmp(data, "any") || !strcasecmp(data, "any\n"))\ 830 if (!strcasecmp(data, "any") || !strcasecmp(data, "any\n"))\
831 value = -1; \ 831 value = -1; \
832 else { \ 832 else { \
833 rc = strict_strtoul(data, 10, &value); \ 833 rc = kstrtoul(data, 10, &value); \
834 if ((rc < 0) || (value >= limit)) \ 834 if ((rc < 0) || (value >= limit)) \
835 return -EIO; \ 835 return -EIO; \
836 } \ 836 } \
@@ -934,7 +934,7 @@ static ssize_t i7core_inject_enable_store(struct device *dev,
934 if (!pvt->pci_ch[pvt->inject.channel][0]) 934 if (!pvt->pci_ch[pvt->inject.channel][0])
935 return 0; 935 return 0;
936 936
937 rc = strict_strtoul(data, 10, &enable); 937 rc = kstrtoul(data, 10, &enable);
938 if ((rc < 0)) 938 if ((rc < 0))
939 return 0; 939 return 0;
940 940
diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c
index 2ae78f20cc28..5e46a9fea31b 100644
--- a/drivers/edac/mce_amd_inj.c
+++ b/drivers/edac/mce_amd_inj.c
@@ -43,7 +43,7 @@ static ssize_t edac_inject_##reg##_store(struct kobject *kobj, \
43 int ret = 0; \ 43 int ret = 0; \
44 unsigned long value; \ 44 unsigned long value; \
45 \ 45 \
46 ret = strict_strtoul(data, 16, &value); \ 46 ret = kstrtoul(data, 16, &value); \
47 if (ret < 0) \ 47 if (ret < 0) \
48 printk(KERN_ERR "Error writing MCE " #reg " field.\n"); \ 48 printk(KERN_ERR "Error writing MCE " #reg " field.\n"); \
49 \ 49 \
@@ -83,7 +83,7 @@ static ssize_t edac_inject_bank_store(struct kobject *kobj,
83 int ret = 0; 83 int ret = 0;
84 unsigned long value; 84 unsigned long value;
85 85
86 ret = strict_strtoul(data, 10, &value); 86 ret = kstrtoul(data, 10, &value);
87 if (ret < 0) { 87 if (ret < 0) {
88 printk(KERN_ERR "Invalid bank value!\n"); 88 printk(KERN_ERR "Invalid bank value!\n");
89 return -EINVAL; 89 return -EINVAL;