@@ -17,6 +17,7 @@
* more details.
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1256,6 +1257,8 @@ static struct ps3_system_bus_driver ps3fb_driver = {
static int __init ps3fb_setup(void)
{
char *options;
+ struct option_iter iter;
+ const char *this_opt;
#ifdef MODULE
return 0;
@@ -1264,16 +1267,9 @@ static int __init ps3fb_setup(void)
if (fb_get_options(DEVICE_NAME, &options))
return -ENXIO;
- if (!options || !*options)
- return 0;
-
- while (1) {
- char *this_opt = strsep(&options, ",");
+ option_iter_init(&iter, options);
- if (!this_opt)
- break;
- if (!*this_opt)
- continue;
+ while (option_iter_next(&iter, this_opt)) {
if (!strncmp(this_opt, "mode:", 5))
ps3fb_mode = simple_strtoul(this_opt + 5, NULL, 0);
else {
@@ -1288,6 +1284,9 @@ static int __init ps3fb_setup(void)
mode_option = mode_option_buf;
}
}
+
+ 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/ps3fb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)