[PATCH] staging: speakup: replace simple_strtoul with kstrtoul

Roxana Blaj roxanagabriela10 at gmail.com
Thu Sep 18 14:42:56 EEST 2014


This fixes the warning:
WARNING: simple_strtoul is obsolete, use kstrtoul instead

Signed-off-by: Roxana Blaj <roxanagabriela10 at gmail.com>
---
 drivers/staging/speakup/kobjects.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index bcc7f62..b26b514 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -126,6 +126,7 @@ static ssize_t chars_chartab_store(struct kobject *kobj,
 	int do_characters = !strcmp(attr->attr.name, "characters");
 	size_t desc_length = 0;
 	int i;
+	int ret;
 
 	spin_lock_irqsave(&speakup_info.spinlock, flags);
 	while (cp < end) {
@@ -153,7 +154,13 @@ static ssize_t chars_chartab_store(struct kobject *kobj,
 			continue;
 		}
 
-		index = simple_strtoul(cp, &temp, 10);
+		temp = cp;
+		ret = kstrtoul(temp, 10, &index);
+		if (ret) {
+			rejected++;
+			cp = linefeed + 1;
+			continue;
+		}
 		if (index > 255) {
 			rejected++;
 			cp = linefeed + 1;
@@ -756,6 +763,7 @@ static ssize_t message_store_helper(const char *buf, size_t count,
 	enum msg_index_t firstmessage = group->start;
 	enum msg_index_t lastmessage = group->end;
 	enum msg_index_t curmessage;
+	int ret;
 
 	while (cp < end) {
 
@@ -783,6 +791,13 @@ static ssize_t message_store_helper(const char *buf, size_t count,
 		}
 
 		index = simple_strtoul(cp, &temp, 10);
+		temp = cp;
+		ret = kstrtoul(temp, 10, &index);
+		if (ret) {
+			rejected++;
+			cp = linefeed + 1;
+			continue;
+		}
 
 		while ((temp < linefeed) && (*temp == ' ' || *temp == '\t'))
 			temp++;
-- 
1.9.1



More information about the firefly mailing list