[PATCH v2 051/101] fbdev/nvidiafb: 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/nvidia/nvidia.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/video/fbdev/nvidia/nvidia.c 
b/drivers/video/fbdev/nvidia/nvidia.c
index 8ad4bcff84df..d779163f919a 100644
--- a/drivers/video/fbdev/nvidia/nvidia.c
+++ b/drivers/video/fbdev/nvidia/nvidia.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/aperture.h>
+#include <linux/cmdline.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -1459,17 +1460,18 @@ static void nvidiafb_remove(struct pci_dev *pd)
  * ------------------------------------------------------------------------- */
 
 #ifndef MODULE
-static int nvidiafb_setup(char *options)
+static int nvidiafb_setup(const char *options)
 {
+       struct option_iter iter;
        char *this_opt;
 
        NVTRACE_ENTER();
-       if (!options || !*options)
-               return 0;
 
-       while ((this_opt = strsep(&options, ",")) != NULL) {
+       option_iter_init(&iter, options);
+
+       while (option_iter_next(&iter, &this_opt)) {
                if (!strncmp(this_opt, "forceCRTC", 9)) {
-                       char *p;
+                       const char *p;
 
                        p = this_opt + 9;
                        if (!*p || !*(++p))
@@ -1505,6 +1507,9 @@ static int nvidiafb_setup(char *options)
                        mode_option = mode_option_buf;
                }
        }
+
+       option_iter_release(&iter);
+
        NVTRACE_LEAVE();
        return 0;
 }
-- 
2.39.2