11 files changed, 29 insertions, 52 deletions

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index f2cc13d76810..782f95822eab 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -50,7 +50,7 @@ static ssize_t led_brightness_store(struct device *dev,
         unsigned long state = simple_strtoul(buf, &after, 10);
         size_t count = after - buf;
 
-        if (*after && isspace(*after))
+        if (isspace(*after))
                 count++;
 
         if (count == size) {
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 3b83406de752..38b3378be442 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -83,7 +83,7 @@ static ssize_t led_delay_on_store(struct device *dev,
         unsigned long state = simple_strtoul(buf, &after, 10);
         size_t count = after - buf;
 
-        if (*after && isspace(*after))
+        if (isspace(*after))
                 count++;
 
         if (count == size) {
@@ -127,7 +127,7 @@ static ssize_t led_delay_off_store(struct device *dev,
         unsigned long state = simple_strtoul(buf, &after, 10);
         size_t count = after - buf;
 
-        if (*after && isspace(*after))
+        if (isspace(*after))
                 count++;
 
         if (count == size) {
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 1a6cb3c7822e..91976e8fae5f 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -12,6 +12,7 @@
 #include <linux/blkdev.h>
 #include <linux/namei.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
@@ -600,11 +601,8 @@ int dm_split_args(int *argc, char ***argvp, char *input)
                 return -ENOMEM;
 
         while (1) {
-                start = end;
-
                 /* Skip whitespace */
-                while (*start && isspace(*start))
-                        start++;
+                start = skip_spaces(end);
 
                 if (!*start)
                         break;  /* success, we hit the end */
diff --git a/drivers/md/md.c b/drivers/md/md.c
index e1f3c1715cca..6f9148623a4d 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -39,6 +39,7 @@
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/poll.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/hdreg.h>
 #include <linux/proc_fs.h>
 #include <linux/random.h>
@@ -3439,8 +3440,7 @@ bitmap_store(mddev_t *mddev, const char *buf, size_t len)
                 }
                 if (*end && !isspace(*end)) break;
                 bitmap_dirty_bits(mddev->bitmap, chunk, end_chunk);
-                buf = end;
-                while (isspace(*buf)) buf++;
+                buf = skip_spaces(end);
         }
         bitmap_unplug(mddev->bitmap); /* flush the bits to disk */
 out:
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 13a64bc081b6..0bc5d474b168 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -779,12 +779,9 @@ static ssize_t pdcs_auto_write(struct kobject *kobj,
         read_unlock(&pathentry->rw_lock);
         
         DPRINTK("%s: flags before: 0x%X\n", __func__, flags);
-                        
-        temp = in;
-        
-        while (*temp && isspace(*temp))
-                temp++;
-        
+
+        temp = skip_spaces(in);
+
         c = *temp++ - '0';
         if ((c != 0) && (c != 1))
                 goto parse_error;
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 0ed84806f8ae..cf61d6a8ef6f 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -1006,11 +1006,8 @@ static int parse_strtoul(const char *buf,
 {
         char *endp;
 
-        while (*buf && isspace(*buf))
-                buf++;
-        *value = simple_strtoul(buf, &endp, 0);
-        while (*endp && isspace(*endp))
-                endp++;
+        *value = simple_strtoul(skip_spaces(buf), &endp, 0);
+        endp = skip_spaces(endp);
         if (*endp || *value > max)
                 return -EINVAL;
 
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index c3f1c8e9d254..68b0c04987e4 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -310,8 +310,7 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                 goto done;
         }
 
-        while (isspace(*buf))
-                ++buf;
+        buf = skip_spaces(buf);
         if (!strnicmp(buf, "disable", 7)) {
                 retval = pnp_disable_dev(dev);
                 goto done;
@@ -353,19 +352,13 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                 pnp_init_resources(dev);
                 mutex_lock(&pnp_res_mutex);
                 while (1) {
-                        while (isspace(*buf))
-                                ++buf;
+                        buf = skip_spaces(buf);
                         if (!strnicmp(buf, "io", 2)) {
-                                buf += 2;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 2);
                                 start = simple_strtoul(buf, &buf, 0);
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf);
                                 if (*buf == '-') {
-                                        buf += 1;
-                                        while (isspace(*buf))
-                                                ++buf;
+                                        buf = skip_spaces(buf + 1);
                                         end = simple_strtoul(buf, &buf, 0);
                                 } else
                                         end = start;
@@ -373,16 +366,11 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                                 continue;
                         }
                         if (!strnicmp(buf, "mem", 3)) {
-                                buf += 3;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 3);
                                 start = simple_strtoul(buf, &buf, 0);
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf);
                                 if (*buf == '-') {
-                                        buf += 1;
-                                        while (isspace(*buf))
-                                                ++buf;
+                                        buf = skip_spaces(buf + 1);
                                         end = simple_strtoul(buf, &buf, 0);
                                 } else
                                         end = start;
@@ -390,17 +378,13 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                                 continue;
                         }
                         if (!strnicmp(buf, "irq", 3)) {
-                                buf += 3;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 3);
                                 start = simple_strtoul(buf, &buf, 0);
                                 pnp_add_irq_resource(dev, start, 0);
                                 continue;
                         }
                         if (!strnicmp(buf, "dma", 3)) {
-                                buf += 3;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 3);
                                 start = simple_strtoul(buf, &buf, 0);
                                 pnp_add_dma_resource(dev, start, 0);
                                 continue;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 5f23eca82804..6315fbd8e68b 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -14,6 +14,7 @@
 #define KMSG_COMPONENT "dasd"
 
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
 #include <linux/proc_fs.h>
@@ -272,10 +273,10 @@ dasd_statistics_write(struct file *file, const char __user *user_buf,
         DBF_EVENT(DBF_DEBUG, "/proc/dasd/statictics: '%s'\n", buffer);
 
         /* check for valid verbs */
-        for (str = buffer; isspace(*str); str++);
+        str = skip_spaces(buffer);
         if (strncmp(str, "set", 3) == 0 && isspace(str[3])) {
                 /* 'set xxx' was given */
-                for (str = str + 4; isspace(*str); str++);
+                str = skip_spaces(str + 4);
                 if (strcmp(str, "on") == 0) {
                         /* switch on statistics profiling */
                         dasd_profile_level = DASD_PROFILE_ON;
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index a482dd7b0311..9b3be74cee5a 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -101,7 +101,7 @@ static ssize_t lcd_store_power(struct device *dev,
         int power = simple_strtoul(buf, &endp, 0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
@@ -140,7 +140,7 @@ static ssize_t lcd_store_contrast(struct device *dev,
         int contrast = simple_strtoul(buf, &endp, 0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 4830b1bf51e5..80abbf323b99 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -67,7 +67,7 @@ static ssize_t display_store_contrast(struct device *dev,
         contrast = simple_strtoul(buf, &endp, 0);
         size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
 
         if (size != count)
diff --git a/drivers/video/output.c b/drivers/video/output.c
index 5e6439ae7394..5137aa016b83 100644
--- a/drivers/video/output.c
+++ b/drivers/video/output.c
@@ -50,7 +50,7 @@ static ssize_t video_output_store_state(struct device *dev,
         int request_state = simple_strtoul(buf,&endp,0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;