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/imxfb.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 34cd4d4fd137..950df484e5be 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -14,6 +14,7 @@
* linux-arm-kernel@xxxxxxxxxxxxxxxxxxxxxx
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -845,21 +846,19 @@ static struct lcd_ops imxfb_lcd_ops = {
static int imxfb_setup(void)
{
- char *opt, *options = NULL;
+ char *options = NULL;
+ struct option_iter iter;
+ const char *opt;
if (fb_get_options("imxfb", &options))
return -ENODEV;
- if (!options || !*options)
- return 0;
+ option_iter_init(&iter, options);
- while ((opt = strsep(&options, ",")) != NULL) {
+ while (option_iter_next(&iter, opt)) {
static char mode_option_buf[256];
int ret;
- if (!*opt)
- continue;
-
ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", opt);
if (WARN(ret < 0, "imxfb: ignoring invalid option, ret=%d\n", ret))
continue;
@@ -868,6 +867,8 @@ static int imxfb_setup(void)
fb_mode = mode_option_buf;
}
+ option_iter_release(&iter);
+
return 0;
}
--
2.39.2
