@@ -20,6 +20,7 @@
* http://rajsky.psych.nyu.edu/Tips/VideoBugs.html
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -504,23 +505,22 @@ static const struct fb_ops macfb_ops = {
.fb_imageblit = cfb_imageblit,
};
-static void __init macfb_setup(char *options)
+static void __init macfb_setup(const char *options)
{
- char *this_opt;
+ struct option_iter iter;
+ const char *this_opt;
- if (!options || !*options)
- return;
-
- 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, "inverse"))
fb_invert_cmaps();
else
if (!strcmp(this_opt, "vidtest"))
vidtest = 1; /* enable experimental CLUT code */
}
+
+ option_iter_release(&iter);
}
static void __init iounmap_macfb(void)
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/macfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)