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@xxxxxxx>
---
drivers/video/fbdev/mx3fb.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index cf14fe08567a..cb9f5ac69e79 100644
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -6,6 +6,7 @@
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
@@ -1653,17 +1654,16 @@ static struct platform_driver mx3fb_driver = {
static int __init mx3fb_setup(void)
{
#ifndef MODULE
- char *opt, *options = NULL;
+ char *options = NULL;
+ struct option_iter iter;
+ const char *opt;
if (fb_get_options("mx3fb", &options))
return -ENODEV;
- if (!options || !*options)
- return 0;
+ option_iter_init(&iter, options);
- while ((opt = strsep(&options, ",")) != NULL) {
- if (!*opt)
- continue;
+ while (option_iter_next(&iter, opt)) {
if (!strncmp(opt, "bpp=", 4))
default_bpp = simple_strtoul(opt + 4, NULL, 0);
else {
@@ -1678,6 +1678,8 @@ static int __init mx3fb_setup(void)
fb_mode = mode_option_buf;
}
}
+
+ option_iter_release(&iter);
#endif
return 0;
--
2.39.2
