Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / edac / i7core_edac.c

diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 0ec3e95a12cd48c37fa100542e2bbe010cb4afad..80a963d64e58c143db789743d664e998c9e1ee66 100644 (file)
--- 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,
        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;
 
@@ -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;
 
@@ -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;
 
@@ -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;                            \
        }                                                       \
@@ -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;