@@ -10,6 +10,7 @@
* Contributors: Kristoffer Glembo <kristoffer@gaisler.com>
*/
+#include <linux/cmdline.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/of_platform.h>
@@ -334,6 +335,8 @@ static int grvga_probe(struct platform_device *dev)
unsigned long grvga_mem_size = 0;
struct grvga_par *par = NULL;
char *options = NULL, *mode_opt = NULL;
+ struct option_iter iter;
+ char *this_opt;
info = framebuffer_alloc(sizeof(struct grvga_par), &dev->dev);
if (!info)
@@ -353,15 +356,13 @@ static int grvga_probe(struct platform_device *dev)
if (!options || !*options)
options = "640x480-8@60";
- while (1) {
- char *this_opt = strsep(&options, ",");
-
- if (!this_opt)
- break;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &this_opt)) {
if (!strncmp(this_opt, "custom", 6)) {
if (grvga_parse_custom(this_opt, &info->var) < 0) {
dev_err(&dev->dev, "Failed to parse custom mode (%s).\n", this_opt);
+ option_iter_release(&iter);
retval = -EINVAL;
goto free_fb;
}
@@ -373,6 +374,8 @@ static int grvga_probe(struct platform_device *dev)
mode_opt = devm_kstrdup(&dev->dev, opt, GFP_KERNEL); // ignore errors
}
+ option_iter_release(&iter);
+
par = info->par;
info->fbops = &grvga_ops;
info->fix = grvga_fix;
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/grvga.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)