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/sis/sis_main.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/video/fbdev/sis/sis_main.c
b/drivers/video/fbdev/sis/sis_main.c
index c16493d3ac4f..9f63812a5f66 100644
--- a/drivers/video/fbdev/sis/sis_main.c
+++ b/drivers/video/fbdev/sis/sis_main.c
@@ -20,6 +20,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@@ -54,7 +55,7 @@
/* Interface used by the world */
#ifndef MODULE
-static int sisfb_setup(char *options);
+static int sisfb_setup(const char *options);
#endif
/* Interface to the low level console driver */
@@ -3987,19 +3988,16 @@ sisfb_handle_command(struct sis_video_info *ivideo,
struct sisfb_cmd *sisfb_comm
}
#ifndef MODULE
-static int __init sisfb_setup(char *options)
+static int __init sisfb_setup(const char *options)
{
+ struct option_iter iter;
char *this_opt;
sisfb_setdefaultparms();
- if(!options || !(*options))
- return 0;
-
- while((this_opt = strsep(&options, ",")) != NULL) {
-
- if(!(*this_opt)) continue;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &this_opt)) {
if(!strncasecmp(this_opt, "off", 3)) {
sisfb_off = 1;
} else if(!strncasecmp(this_opt, "forcecrt2type:", 14)) {
@@ -4081,6 +4079,8 @@ static int __init sisfb_setup(char *options)
}
+ option_iter_release(&iter);
+
return 0;
}
#endif
--
2.39.2
