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/amifb.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c
index 6edfd0bfdd57..b968cf2c5f06 100644
--- a/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@ -40,6 +40,7 @@
  * for more details.
  */
 
+#include <linux/cmdline.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -2345,16 +2346,14 @@ static void __init amifb_setup_mcap(char *spec)
        amifb_vfmax = vmax;
 }
 
-static int __init amifb_setup(char *options)
+static int __init amifb_setup(const char *options)
 {
-       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) {
-               if (!*this_opt)
-                       continue;
+       while (option_iter_next(&iter, this_opt)) {
                if (!strcmp(this_opt, "inverse")) {
                        fb_invert_cmaps();
                } else if (!strcmp(this_opt, "ilbm"))
@@ -2376,6 +2375,8 @@ static int __init amifb_setup(char *options)
                }
        }
 
+       option_iter_release(&iter);
+
        if (min_fstrt < 48)
                min_fstrt = 48;
 
-- 
2.39.2

Reply via email to