[PATCH v2 053/101] fbdev/ocfb: Parse option string with struct option_iter
From: Thomas Zimmermann <tzimmermann@suse.de>
Date: 2023-03-09 16:08:27
Also in:
dri-devel, lkml
Subsystem:
framebuffer layer, the rest · Maintainers:
Helge Deller, Linus Torvalds
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 <tzimmermann@suse.de> --- drivers/video/fbdev/ocfb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c
index 9786c3641448..fa15b932b323 100644
--- a/drivers/video/fbdev/ocfb.c
+++ b/drivers/video/fbdev/ocfb.c@@ -8,6 +8,7 @@ * kind, whether express or implied. */ +#include <linux/cmdline.h> #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/errno.h>
@@ -68,22 +69,21 @@ struct ocfb_dev { }; #ifndef MODULE -static int __init ocfb_setup(char *options) +static int __init ocfb_setup(const char *options) { + struct option_iter iter; char *curr_opt; - if (!options || !*options) - return 0; - - while ((curr_opt = strsep(&options, ",")) != NULL) { - if (!*curr_opt) - continue; + option_iter_init(&iter, options); + while (option_iter_next(&iter, &curr_opt)) { kfree(mode_option_buf); mode_option_buf = kstrdup(curr_opt, GFP_KERNEL); // ignore errors mode_option = mode_option_buf; } + option_iter_release(&iter); + return 0; } #endif
--
2.39.2