3 files changed, 9 insertions, 23 deletions

diff --git a/lib/argv_split.c b/lib/argv_split.c
index 5205a8dae5bc..4b1b083f219c 100644
--- a/lib/argv_split.c
+++ b/lib/argv_split.c
@@ -4,17 +4,10 @@
 
 #include <linux/kernel.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 
-static const char *skip_sep(const char *cp)
-{
-        while (*cp && isspace(*cp))
-                cp++;
-
-        return cp;
-}
-
 static const char *skip_arg(const char *cp)
 {
         while (*cp && !isspace(*cp))
@@ -28,7 +21,7 @@ static int count_argc(const char *str)
         int count = 0;
 
         while (*str) {
-                str = skip_sep(str);
+                str = skip_spaces(str);
                 if (*str) {
                         count++;
                         str = skip_arg(str);
@@ -82,7 +75,7 @@ char **argv_split(gfp_t gfp, const char *str, int *argcp)
         argvp = argv;
 
         while (*str) {
-                str = skip_sep(str);
+                str = skip_spaces(str);
 
                 if (*str) {
                         const char *p = str;
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index e22c148e4b7f..f93502915988 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -21,6 +21,7 @@
 #include <linux/list.h>
 #include <linux/sysctl.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/dynamic_debug.h>
 #include <linux/debugfs.h>
@@ -209,8 +210,7 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
                 char *end;
 
                 /* Skip leading whitespace */
-                while (*buf && isspace(*buf))
-                        buf++;
+                buf = skip_spaces(buf);
                 if (!*buf)
                         break;  /* oh, it was trailing whitespace */
 
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c50733a690f0..7857d4dd62d3 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1766,13 +1766,6 @@ EXPORT_SYMBOL_GPL(bprintf);
 
 #endif /* CONFIG_BINARY_PRINTF */
 
-static noinline char *skip_space(const char *str)
-{
-        while (isspace(*str))
-                ++str;
-        return (char *)str;
-}
-
 /**
  * vsscanf - Unformat a buffer into a list of arguments
  * @buf:        input buffer
@@ -1794,8 +1787,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                  * white space, including none, in the input.
                  */
                 if (isspace(*fmt)) {
-                        fmt = skip_space(fmt);
-                        str = skip_space(str);
+                        fmt = skip_spaces(++fmt);
+                        str = skip_spaces(str);
                 }
 
                 /* anything that is not a conversion must match exactly */
@@ -1865,7 +1858,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                         if (field_width == -1)
                                 field_width = INT_MAX;
                         /* first, skip leading white space in buffer */
-                        str = skip_space(str);
+                        str = skip_spaces(str);
 
                         /* now copy until next white space */
                         while (*str && !isspace(*str) && field_width--)
@@ -1907,7 +1900,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 /* have some sort of integer conversion.
                  * first, skip white space in buffer.
                  */
-                str = skip_space(str);
+                str = skip_spaces(str);
 
                 digit = *str;
                 if (is_sign && digit == '-')