[PATCH 3.11 118/121] EDAC: Replace strict_strtol() with kstrtol()

Luis Henriques luis.henriques at canonical.com
Fri Feb 21 12:49:02 UTC 2014


3.11.10.5 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jingoo Han <jg1.han at samsung.com>

commit c542b53da9ffa4fe9de61149818a06aacae531f8 upstream.

The usage of strict_strtol() is not preferred, because strict_strtol()
is obsolete. Thus, kstrtol() should be used.

Signed-off-by: Jingoo Han <jg1.han at samsung.com>
Signed-off-by: Borislav Petkov <bp at suse.de>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/edac/edac_mc_sysfs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index e7c32c4..9f7e0e60 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -58,8 +58,10 @@ static int edac_set_poll_msec(const char *val, struct kernel_param *kp)
 	if (!val)
 		return -EINVAL;
 
-	ret = strict_strtol(val, 0, &l);
-	if (ret == -EINVAL || ((int)l != l))
+	ret = kstrtol(val, 0, &l);
+	if (ret)
+		return ret;
+	if ((int)l != l)
 		return -EINVAL;
 	*((int *)kp->arg) = l;
 
-- 
1.9.0





More information about the kernel-team mailing list