diff options
author | York Sun <york.sun@nxp.com> | 2016-08-23 18:16:10 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2016-09-01 04:28:03 -0400 |
commit | f47ae798d82fb0d77d76b3b3f700d0e61f73d7c1 (patch) | |
tree | f5118d15c497fecced6194d8e71890efd81e74e3 | |
parent | eeb3d68b6c83abdb80bc0823cbb77cd49484793c (diff) |
EDAC, fsl_ddr: Replace simple_strtoul() with kstrtoul()
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>
-rw-r--r-- | drivers/edac/fsl_ddr_edac.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index afade14c3e93..4ddf8382369f 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c | |||
@@ -92,9 +92,15 @@ static ssize_t fsl_mc_inject_data_hi_store(struct device *dev, | |||
92 | { | 92 | { |
93 | struct mem_ctl_info *mci = to_mci(dev); | 93 | struct mem_ctl_info *mci = to_mci(dev); |
94 | struct fsl_mc_pdata *pdata = mci->pvt_info; | 94 | struct fsl_mc_pdata *pdata = mci->pvt_info; |
95 | unsigned long val; | ||
96 | int rc; | ||
97 | |||
95 | if (isdigit(*data)) { | 98 | if (isdigit(*data)) { |
96 | ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_HI, | 99 | rc = kstrtoul(data, 0, &val); |
97 | simple_strtoul(data, NULL, 0)); | 100 | if (rc) |
101 | return rc; | ||
102 | |||
103 | ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_HI, val); | ||
98 | return count; | 104 | return count; |
99 | } | 105 | } |
100 | return 0; | 106 | return 0; |
@@ -106,9 +112,15 @@ static ssize_t fsl_mc_inject_data_lo_store(struct device *dev, | |||
106 | { | 112 | { |
107 | struct mem_ctl_info *mci = to_mci(dev); | 113 | struct mem_ctl_info *mci = to_mci(dev); |
108 | struct fsl_mc_pdata *pdata = mci->pvt_info; | 114 | struct fsl_mc_pdata *pdata = mci->pvt_info; |
115 | unsigned long val; | ||
116 | int rc; | ||
117 | |||
109 | if (isdigit(*data)) { | 118 | if (isdigit(*data)) { |
110 | ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_LO, | 119 | rc = kstrtoul(data, 0, &val); |
111 | simple_strtoul(data, NULL, 0)); | 120 | if (rc) |
121 | return rc; | ||
122 | |||
123 | ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_LO, val); | ||
112 | return count; | 124 | return count; |
113 | } | 125 | } |
114 | return 0; | 126 | return 0; |
@@ -120,9 +132,15 @@ static ssize_t fsl_mc_inject_ctrl_store(struct device *dev, | |||
120 | { | 132 | { |
121 | struct mem_ctl_info *mci = to_mci(dev); | 133 | struct mem_ctl_info *mci = to_mci(dev); |
122 | struct fsl_mc_pdata *pdata = mci->pvt_info; | 134 | struct fsl_mc_pdata *pdata = mci->pvt_info; |
135 | unsigned long val; | ||
136 | int rc; | ||
137 | |||
123 | if (isdigit(*data)) { | 138 | if (isdigit(*data)) { |
124 | ddr_out32(pdata->mc_vbase + FSL_MC_ECC_ERR_INJECT, | 139 | rc = kstrtoul(data, 0, &val); |
125 | simple_strtoul(data, NULL, 0)); | 140 | if (rc) |
141 | return rc; | ||
142 | |||
143 | ddr_out32(pdata->mc_vbase + FSL_MC_ECC_ERR_INJECT, val); | ||
126 | return count; | 144 | return count; |
127 | } | 145 | } |
128 | return 0; | 146 | return 0; |