@@ -43,6 +43,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -973,9 +974,19 @@ static struct platform_device *xxxfb_device;
* Only necessary if your driver takes special options,
* otherwise we fall back on the generic fb_setup().
*/
-static int __init xxxfb_setup(char *options)
+static int __init xxxfb_setup(const char *options)
{
- /* Parse user specified options (`video=xxxfb:') */
+ /* Parse user-specified options (`video=xxxfb:') */
+
+ struct option_iter iter;
+ const char *this_opt;
+
+ option_iter_init(&iter, options);
+
+ while (option_iter_next(&iter, this_opt)) {
+ }
+
+ option_iter_release(&iter);
}
#endif /* MODULE */
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/skeletonfb.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)