@@ -12,6 +12,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1521,18 +1522,15 @@ static struct pci_driver s3fb_pci_driver = {
/* Parse user specified options */
#ifndef MODULE
-static int __init s3fb_setup(char *options)
+static int __init s3fb_setup(const char *options)
{
+ struct option_iter iter;
char *opt;
- if (!options || !*options)
- return 0;
-
- while ((opt = strsep(&options, ",")) != NULL) {
+ option_iter_init(&iter, options);
- if (!*opt)
- continue;
- else if (!strncmp(opt, "mtrr:", 5))
+ while (option_iter_next(&iter, &opt)) {
+ if (!strncmp(opt, "mtrr:", 5))
mtrr = simple_strtoul(opt + 5, NULL, 0);
else if (!strncmp(opt, "fasttext:", 9))
fasttext = simple_strtoul(opt + 9, NULL, 0);
@@ -1543,6 +1541,8 @@ static int __init s3fb_setup(char *options)
}
}
+ option_iter_release(&iter);
+
return 0;
}
#endif
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/s3fb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)