From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id DFE701EF951; Sat, 13 Feb 2016 15:34:06 -0500 (EST) Received: from mail-qg0-f41.google.com (mail-qg0-f41.google.com [209.85.192.41]) by befuddled.reisers.ca (Postfix) with ESMTPS id 5D3621EF742 for ; Sat, 13 Feb 2016 15:34:05 -0500 (EST) Received: by mail-qg0-f41.google.com with SMTP id b35so86309304qge.0 for ; Sat, 13 Feb 2016 12:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=aJr/P/4VATh+rj5KuCZ0/UJyIdbnDxNzv5IHnDv0Tvc=; b=vc825/2px/n6QPaCz9x771CLbpRSYY22KNnjS7ooNg35xgI1xOri+HzvQrxCOzGOZD eaONjZByzn1QBcgAY9K7ZELVtNyb/1rnDo5tCmt4HtyOIlbSpGUPSbIHX4fna5OpvqkE C2KkmvFO2+pwtTttTA/p8P+q6rXe5Ve67oeU7TuxCyGjvM1isKFCwEmgpeccesbsqqre t6/ubRob5+kOsMqfF7F/NlXekKjBOnemIwIqiWyQdxd5IlXDmQw9uWopvR78xw8jVh51 DBUjjRlu3PzfIZX9ObcMcK7mog071p4vpQ0MXL3ZwYAEcjoIDMpvCJMdJMsTrvK2Kvmu qAjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=aJr/P/4VATh+rj5KuCZ0/UJyIdbnDxNzv5IHnDv0Tvc=; b=kZ+WyAxsLBFbaKHfdx7AcTSVal3dM83lYp9EGbh0T36B8WUuPLqI7LmkbX13W7TmBi MKn3AVoIkfgt+RP1MtBFppfRslty0M51bGAFBR6IPRPRWZKvaAIcsC7DpLSMx0fZA9rf OMasf55kTK1liRJGyw6Rm4kWCUQkw8nIPG+u0UEUh9o2a9/XXYzyF1bbWuHgqDlSOg07 GwzIkt4C9AWPQmxSvaMJqsgO8SVV4x+cnN9yS/a0+VT9PJ9FvCAfbEtSP+Yssi3zxzch 1QwROx8oW+INEufVIzvLcw6kS3F2Dq6ODEkOo3S4Ij537Q2Dju+ko35XIgLI84UiWetw AfQQ== X-Gm-Message-State: AG10YOQjYbee5BuX8X8rHu+hzENL9NLyxQ/kx1VrChyMf9TYqJIZUvag27/FlHLEo0Vo6g== X-Received: by 10.141.3.86 with SMTP id f83mr11196470qhd.98.1455395634909; Sat, 13 Feb 2016 12:33:54 -0800 (PST) Received: from arch_laptop ([75.134.3.214]) by smtp.gmail.com with ESMTPSA id j7sm8083760qgd.2.2016.02.13.12.33.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Feb 2016 12:33:54 -0800 (PST) Date: Sat, 13 Feb 2016 15:33:52 -0500 From: Joseph Bisch To: speakup@linux-speakup.org Subject: [PATCH] staging: speakup: Change simple_strtoul usage to kstrtoul Message-ID: <20160213203351.GA4750@arch_laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 X-BeenThere: speakup@linux-speakup.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Speakup is a screen review system for Linux." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2016 20:34:07 -0000 This patch fixes the checkpatch.pl warning: WARNING: simple_strtoul is obsolete, use kstrtoul instead Signed-off-by: Joseph Bisch --- drivers/staging/speakup/kobjects.c | 12 ++++++++++-- drivers/staging/speakup/main.c | 6 +++++- drivers/staging/speakup/varhandlers.c | 6 +++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c index fdfeb42..8eb4fdf 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 err; spin_lock_irqsave(&speakup_info.spinlock, flags); while (cp < end) { @@ -153,7 +154,10 @@ static ssize_t chars_chartab_store(struct kobject *kobj, continue; } - index = simple_strtoul(cp, &temp, 10); + temp = cp; + err = kstrtoul(temp, 10, &index); + if (err) + return err; if (index > 255) { rejected++; cp = linefeed + 1; @@ -754,6 +758,7 @@ static ssize_t message_store_helper(const char *buf, size_t count, int used = 0; int rejected = 0; int reset = 0; + int err; enum msg_index_t firstmessage = group->start; enum msg_index_t lastmessage = group->end; enum msg_index_t curmessage; @@ -783,7 +788,10 @@ static ssize_t message_store_helper(const char *buf, size_t count, continue; } - index = simple_strtoul(cp, &temp, 10); + temp = cp; + err = kstrtoul(temp, 10, &index); + if (err) + return err; while ((temp < linefeed) && (*temp == ' ' || *temp == '\t')) temp++; diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c index 30cf973..9add4ab 100644 --- a/drivers/staging/speakup/main.c +++ b/drivers/staging/speakup/main.c @@ -1904,6 +1904,7 @@ static int handle_goto(struct vc_data *vc, u_char type, u_char ch, u_short key) static int num; int maxlen; char *cp; + int ret; if (type == KT_SPKUP && ch == SPEAKUP_GOTO) goto do_goto; @@ -1940,7 +1941,10 @@ oops: return 1; } - goto_pos = simple_strtoul(goto_buf, &cp, 10); + cp = goto_buf; + ret = kstrtoul(cp, 10, &goto_pos); + if (ret) + return ret; if (*cp == 'x') { if (*goto_buf < '0') diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c index ab4fe8d..7a640e3 100644 --- a/drivers/staging/speakup/varhandlers.c +++ b/drivers/staging/speakup/varhandlers.c @@ -324,8 +324,12 @@ char *spk_strlwr(char *s) char *spk_s2uchar(char *start, char *dest) { int val; + int ret; - val = simple_strtoul(skip_spaces(start), &start, 10); + start = skip_spaces(start); + ret = kstrtoul(start, 10, (unsigned long *)&val); + if (ret) + return NULL; if (*start == ',') start++; *dest = (u_char)val; -- 2.7.0 This is my first patch to the Linux kernel, so I appreciate any information about how it can be improved. I tested this patch with espeakup and it appears to not break anything. Also, I was unsure if I should notify anyone else or any other mailing lists, so let me know if I should forward this email anywhere. Joseph