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@xxxxxxx>
---
drivers/video/fbdev/au1100fb.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c
index 519313b8bb00..17dae92ac53f 100644
--- a/drivers/video/fbdev/au1100fb.c
+++ b/drivers/video/fbdev/au1100fb.c
@@ -42,6 +42,7 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/clk.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -365,7 +366,9 @@ static const struct fb_ops au1100fb_ops =
static int au1100fb_setup(struct au1100fb_device *fbdev)
{
- char *this_opt, *options;
+ char *options;
+ struct option_iter iter;
+ const char *this_opt;
int num_panels = ARRAY_SIZE(known_lcd_panels);
if (num_panels <= 0) {
@@ -375,10 +378,10 @@ static int au1100fb_setup(struct au1100fb_device *fbdev)
if (fb_get_options(DRIVER_NAME, &options))
return -ENODEV;
- if (!options)
- return -ENODEV;
- while ((this_opt = strsep(&options, ",")) != NULL) {
+ option_iter_init(&iter, options);
+
+ while (option_iter_next(&iter, this_opt)) {
/* Panel option */
if (!strncmp(this_opt, "panel:", 6)) {
int i;
@@ -401,6 +404,8 @@ static int au1100fb_setup(struct au1100fb_device *fbdev)
print_warn("Unsupported option \"%s\"", this_opt);
}
+ option_iter_release(&iter);
+
print_info("Panel=%s", fbdev->panel->name);
return 0;
--
2.39.2
