[PATCH v2 010/101] fbdev/atafb: Parse option string with struct option_iter

From: Thomas Zimmermann
Date: Thu Mar 09 2023 - 11:03:44 EST


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.

v2:
* add missing call to option_iter_init()

Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
---
drivers/video/fbdev/atafb.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c
index f0cc7c992c88..6e625ac020b5 100644
--- a/drivers/video/fbdev/atafb.c
+++ b/drivers/video/fbdev/atafb.c
@@ -47,6 +47,7 @@
#define ATAFB_EXT
#define ATAFB_FALCON

+#include <linux/cmdline.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
@@ -2934,17 +2935,15 @@ static void __init atafb_setup_user(char *spec)
}
}

-static int __init atafb_setup(char *options, struct platform_device *pdev)
+static int __init atafb_setup(const char *options, struct platform_device *pdev)
{
+ struct option_iter iter;
char *this_opt;
int temp;

- if (!options || !*options)
- return 0;
+ option_iter_init(&iter, options);

- while ((this_opt = strsep(&options, ",")) != NULL) {
- if (!*this_opt)
- continue;
+ while (option_iter_next(&iter, &this_opt)) {
if ((temp = get_video_mode(this_opt))) {
// ignore errors
mode_option = devm_kstrdup(&pdev->dev, this_opt, GFP_KERNEL);
@@ -2981,6 +2980,9 @@ static int __init atafb_setup(char *options, struct platform_device *pdev)
else if (!strncmp(this_opt, "R", 1))
atafb_setup_user(this_opt + 1);
}
+
+ option_iter_release(&iter);
+
return 0;
}

--
2.39.2