@@ -8,6 +8,7 @@
* kind, whether express or implied.
*/
+#include <linux/cmdline.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/errno.h>
@@ -67,20 +68,17 @@ struct ocfb_dev {
};
#ifndef MODULE
-static int __init ocfb_setup(char *options)
+static int __init ocfb_setup(const char *options)
{
- char *curr_opt;
+ struct option_iter iter;
+ const char *curr_opt;
- if (!options || !*options)
- return 0;
+ option_iter_init(&iter, options);
- while ((curr_opt = strsep(&options, ",")) != NULL) {
+ while (option_iter_next(&iter, curr_opt)) {
static char mode_option_buf[256];
int ret;
- if (!*curr_opt)
- continue;
-
ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", curr_opt);
if (WARN(ret < 0, "ocfb: ignoring invalid option, ret=%d\n", ret))
continue;
@@ -89,6 +87,8 @@ static int __init ocfb_setup(char *options)
mode_option = mode_option_buf;
}
+ 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/ocfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)