[PATCH 83/99] fbdev/tgafb: Parse option string with struct option_iter

[Thomas Zimmermann]

Use struct option_iter to walk over the individual options in the
driver's option string. Replaces the hand-written strsep() loop with
a clean interface. The helpers for struct option_iter handle empty
option strings and empty options transparently. The struct's _init
and _release functions duplicate and release the option string's
memory buffer as needed.

Done in preparation of constifying the option string.

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
---
 drivers/video/fbdev/tgafb.c | 45 +++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index a412fdddfd8c..704909edf89d 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c
@@ -14,6 +14,7 @@
 
 #include <linux/aperture.h>
 #include <linux/bitrev.h>
+#include <linux/cmdline.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/device.h>
@@ -1571,35 +1572,31 @@ static void tgafb_exit(void)
 }
 
 #ifndef MODULE
-static int tgafb_setup(char *arg)
+static int tgafb_setup(const char *arg)
 {
-       char *this_opt;
+       struct option_iter iter;
+       const char *this_opt;
 
-       if (arg && *arg) {
-               while ((this_opt = strsep(&arg, ","))) {
-                       if (!*this_opt)
+       option_iter_init(&iter, arg);
+
+       while (option_iter_next(&iter, this_opt)) {
+               if (!strncmp(this_opt, "mode:", 5)) {
+                       static char mode_option_buf[256];
+                       int ret;
+
+                       ret = snprintf(mode_option_buf, 
sizeof(mode_option_buf), "%s",
+                                      this_opt + 5);
+                       if (WARN(ret < 0, "tgafb: ignoring invalid option, 
ret=%d\n", ret))
                                continue;
-                       if (!strncmp(this_opt, "mode:", 5)) {
-                               static char mode_option_buf[256];
-                               int ret;
-
-                               ret = snprintf(mode_option_buf, 
sizeof(mode_option_buf), "%s",
-                                              this_opt + 5);
-                               if (WARN(ret < 0,
-                                        "tgafb: ignoring invalid option, 
ret=%d\n",
-                                        ret))
-                                       continue;
-                               if (WARN(ret >= sizeof(mode_option_buf),
-                                        "tgafb: option too long\n"))
-                                       continue;
-                               mode_option = mode_option_buf;
-                       } else
-                               printk(KERN_ERR
-                                      "tgafb: unknown parameter %s\n",
-                                      this_opt);
-               }
+                       if (WARN(ret >= sizeof(mode_option_buf), "tgafb: option 
too long\n"))
+                               continue;
+                       mode_option = mode_option_buf;
+               } else
+                       printk(KERN_ERR "tgafb: unknown parameter %s\n", 
this_opt);
        }
 
+       option_iter_release(&iter);
+
        return 0;
 }
 #endif /* !MODULE */
-- 
2.39.2