@@ -14,6 +14,7 @@
* - Blanking 8bpp displays with VIDC
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -879,17 +880,15 @@ static struct options {
{ NULL, NULL }
};
-static int acornfb_setup(char *options)
+static int acornfb_setup(const char *options)
{
- struct options *optp;
- char *opt;
+ struct option_iter iter;
+ const char *opt;
- if (!options || !*options)
- return 0;
+ option_iter_init(&iter, options);
- while ((opt = strsep(&options, ",")) != NULL) {
- if (!*opt)
- continue;
+ while (option_iter_next(&iter, opt)) {
+ struct options *optp;
for (optp = opt_table; optp->name; optp++) {
int optlen;
@@ -907,6 +906,9 @@ static int acornfb_setup(char *options)
printk(KERN_ERR "acornfb: unknown parameter: %s\n",
opt);
}
+
+ 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/acornfb.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)