EDAC, fsl_ddr: Replace simple_strtoul() with kstrtoul()
authorYork Sun <york.sun@nxp.com>
Tue, 23 Aug 2016 22:16:10 +0000 (15:16 -0700)
committerBorislav Petkov <bp@suse.de>
Thu, 1 Sep 2016 08:28:03 +0000 (10:28 +0200)
Replace obsolete simple_strtoul() with kstrtoul().

Signed-off-by: York Sun <york.sun@nxp.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1471990593-27536-1-git-send-email-york.sun@nxp.com
Signed-off-by: Borislav Petkov <bp@suse.de>
drivers/edac/fsl_ddr_edac.c

index afade14c3e939a460318e195caf82e1349f14bd2..4ddf8382369f1d657045c6187a81afd00187162e 100644 (file)
@@ -92,9 +92,15 @@ static ssize_t fsl_mc_inject_data_hi_store(struct device *dev,
 {
        struct mem_ctl_info *mci = to_mci(dev);
        struct fsl_mc_pdata *pdata = mci->pvt_info;
+       unsigned long val;
+       int rc;
+
        if (isdigit(*data)) {
-               ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_HI,
-                         simple_strtoul(data, NULL, 0));
+               rc = kstrtoul(data, 0, &val);
+               if (rc)
+                       return rc;
+
+               ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_HI, val);
                return count;
        }
        return 0;
@@ -106,9 +112,15 @@ static ssize_t fsl_mc_inject_data_lo_store(struct device *dev,
 {
        struct mem_ctl_info *mci = to_mci(dev);
        struct fsl_mc_pdata *pdata = mci->pvt_info;
+       unsigned long val;
+       int rc;
+
        if (isdigit(*data)) {
-               ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_LO,
-                         simple_strtoul(data, NULL, 0));
+               rc = kstrtoul(data, 0, &val);
+               if (rc)
+                       return rc;
+
+               ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_LO, val);
                return count;
        }
        return 0;
@@ -120,9 +132,15 @@ static ssize_t fsl_mc_inject_ctrl_store(struct device *dev,
 {
        struct mem_ctl_info *mci = to_mci(dev);
        struct fsl_mc_pdata *pdata = mci->pvt_info;
+       unsigned long val;
+       int rc;
+
        if (isdigit(*data)) {
-               ddr_out32(pdata->mc_vbase + FSL_MC_ECC_ERR_INJECT,
-                         simple_strtoul(data, NULL, 0));
+               rc = kstrtoul(data, 0, &val);
+               if (rc)
+                       return rc;
+
+               ddr_out32(pdata->mc_vbase + FSL_MC_ECC_ERR_INJECT, val);
                return count;
        }
        return 0;