Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus

[~andy/linux] / drivers / edac / amd64_edac_inj.c

diff --git a/drivers/edac/amd64_edac_inj.c b/drivers/edac/amd64_edac_inj.c
index 845f04786c2de4baedf0952d2ec2b5a830e62602..0d66ae68d4681a9bb1ceedfca97fcafbde144d2c 100644 (file)
--- 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,
        unsigned long value;
        int ret;
 
-       ret = strict_strtoul(data, 10, &value);
+       ret = kstrtoul(data, 10, &value);
        if (ret < 0)
                return ret;
 
@@ -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;
 
@@ -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;
 
@@ -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;
 
@@ -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;