[PATCH 64/99] fbdev/pvr2fb: 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/pvr2fb.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index cd778f8753f1..9255b3506b81 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -46,6 +46,7 @@
 #undef DEBUG
 
 #include <linux/aperture.h>
+#include <linux/cmdline.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -1024,20 +1025,18 @@ static void pvr2fb_pci_exit(void)
  */
 
 #ifndef MODULE
-static int __init pvr2fb_setup(char *options)
+static int __init pvr2fb_setup(const char *options)
 {
-       char *this_opt;
        char cable_arg[80];
        char output_arg[80];
-
-       if (!options || !*options)
-               return 0;
+       struct option_iter iter;
+       const char *this_opt;
 
        cable_arg[0] = output_arg[0] = 0;
 
-       while ((this_opt = strsep(&options, ","))) {
-               if (!*this_opt)
-                       continue;
+       option_iter_init(&iter, options);
+
+       while (option_iter_next(&iter, this_opt)) {
                if (!strcmp(this_opt, "inverse")) {
                        fb_invert_cmaps();
                } else if (!strncmp(this_opt, "cable:", 6)) {
@@ -1061,6 +1060,8 @@ static int __init pvr2fb_setup(char *options)
                }
        }
 
+       option_iter_release(&iter);
+
        if (*cable_arg)
                cable_type = pvr2_get_param_val(cables, cable_arg, 3);
        if (*output_arg)
-- 
2.39.2