@@ -31,6 +31,7 @@
*/
#include <linux/clk.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
@@ -1578,16 +1579,17 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
static int au1200fb_setup(struct au1200fb_platdata *pd)
{
char *options = NULL;
- char *this_opt, *endptr;
+ struct option_iter iter;
+ const char *this_opt;
+ char *endptr;
int num_panels = ARRAY_SIZE(known_lcd_panels);
int panel_idx = -1;
fb_get_options(DRIVER_NAME, &options);
- if (!options)
- goto out;
+ option_iter_init(&iter, options);
- while ((this_opt = strsep(&options, ",")) != NULL) {
+ while (option_iter_next(&iter, this_opt)) {
/* Panel option - can be panel name,
* "bs" for board-switch, or number/index */
if (!strncmp(this_opt, "panel:", 6)) {
@@ -1636,7 +1638,8 @@ static int au1200fb_setup(struct au1200fb_platdata *pd)
print_warn("Unsupported option \"%s\"", this_opt);
}
-out:
+ 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/au1200fb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)