@@ -34,6 +34,7 @@
* entering standby mode.)
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1486,17 +1487,14 @@ static void cyberpro_free_fb_info(struct cfb_info *cfb)
* video=cyber2000:font:fontname
*/
#ifndef MODULE
-static int cyber2000fb_setup(char *options)
+static int cyber2000fb_setup(const char *options)
{
+ struct option_iter iter;
char *opt;
- if (!options || !*options)
- return 0;
-
- while ((opt = strsep(&options, ",")) != NULL) {
- if (!*opt)
- continue;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &opt)) {
if (strncmp(opt, "font:", 5) == 0) {
static char default_font_storage[40];
@@ -1508,6 +1506,9 @@ static int cyber2000fb_setup(char *options)
printk(KERN_ERR "CyberPro20x0: unknown parameter: %s\n", opt);
}
+
+ option_iter_release(&iter);
+
return 0;
}
#endif /* MODULE */
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/cyber2000fb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)