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/savage/savagefb_driver.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/video/fbdev/savage/savagefb_driver.c 
b/drivers/video/fbdev/savage/savagefb_driver.c
index 19fffe0b6cdd..94026848d67d 100644
--- a/drivers/video/fbdev/savage/savagefb_driver.c
+++ b/drivers/video/fbdev/savage/savagefb_driver.c
@@ -42,6 +42,7 @@
  */
 
 #include <linux/aperture.h>
+#include <linux/cmdline.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -2535,15 +2536,15 @@ static void __exit savage_done(void)
 
 /* ************************* init in-kernel code ************************** */
 
-static int __init savagefb_setup(char *options)
+static int __init savagefb_setup(const char *options)
 {
 #ifndef MODULE
-       char *this_opt;
+       struct option_iter iter;
+       const char *this_opt;
 
-       if (!options || !*options)
-               return 0;
+       option_iter_init(&iter, options);
 
-       while ((this_opt = strsep(&options, ",")) != NULL) {
+       while (option_iter_next(&iter, this_opt)) {
                static char mode_option_buf[256];
                int ret;
 
@@ -2554,6 +2555,9 @@ static int __init savagefb_setup(char *options)
                        continue;
                mode_option = mode_option_buf;
        }
+
+       option_iter_release(&iter);
+
 #endif /* !MODULE */
        return 0;
 }
-- 
2.39.2

Reply via email to