@@ -14,6 +14,7 @@
* linux-arm-kernel@lists.arm.linux.org.uk
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -845,21 +846,21 @@ static struct lcd_ops imxfb_lcd_ops = {
static int imxfb_setup(struct platform_device *pdev)
{
- char *opt, *options = NULL;
+ char *options = NULL;
+ struct option_iter iter;
+ char *opt;
if (fb_get_options("imxfb", &options))
return -ENODEV;
- if (!options || !*options)
- return 0;
-
- while ((opt = strsep(&options, ",")) != NULL) {
- if (!*opt)
- continue;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &opt)) {
fb_mode = devm_kstrdup(&pdev->dev, opt, GFP_KERNEL); // ignore errors
}
+ option_iter_release(&iter);
+
return 0;
}
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/imxfb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)