@@ -42,6 +42,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -2537,19 +2538,22 @@ static void __exit savage_done(void)
/* ************************* init in-kernel code ************************** */
-static int __init savagefb_setup(char *options)
+static int __init savagefb_setup(const char *options)
{
#ifndef MODULE
+ struct option_iter iter;
char *this_opt;
- if (!options || !*options)
- return 0;
+ option_iter_init(&iter, options);
- while ((this_opt = strsep(&options, ",")) != NULL) {
+ while (option_iter_next(&iter, &this_opt)) {
kfree(mode_option_buf);
mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
mode_option = mode_option_buf;
}
+
+ option_iter_release(&iter);
+
#endif /* !MODULE */
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/savage/savagefb_driver.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)