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/cirrusfb.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index fbf9281a7004..c6882bff3862 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -35,6 +35,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -2323,17 +2324,14 @@ static struct zorro_driver cirrusfb_zorro_driver = {
#endif /* CONFIG_ZORRO */
#ifndef MODULE
-static int __init cirrusfb_setup(char *options)
+static int __init cirrusfb_setup(const char *options)
{
- char *this_opt;
+ struct option_iter iter;
+ const char *this_opt;
- 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 (!strcmp(this_opt, "noaccel"))
noaccel = 1;
else {
@@ -2351,6 +2349,9 @@ static int __init cirrusfb_setup(char *options)
mode_option = mode_option_buf;
}
}
+
+ option_iter_release(&iter);
+
return 0;
}
#endif
--
2.39.2
