[PATCH v2 045/101] fbdev/matroxfb: Parse option string with struct option_iter

From: Thomas Zimmermann
Date: Thu Mar 09 2023 - 11:06:19 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.

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

diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index a043a737ea9f..4c2086136e9b 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -101,6 +101,7 @@
*/

#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/version.h>

#include "matroxfb_base.h"
@@ -2333,17 +2334,14 @@ static void __exit matrox_done(void) {

/* ************************* init in-kernel code ************************** */

-static int __init matroxfb_setup(char *options) {
+static int __init matroxfb_setup(const char *options)
+{
+ struct option_iter iter;
char *this_opt;

- DBG(__func__)
-
- if (!options || !*options)
- return 0;
-
- while ((this_opt = strsep(&options, ",")) != NULL) {
- if (!*this_opt) continue;
+ option_iter_init(&iter, options);

+ while (option_iter_next(&iter, &this_opt)) {
dprintk("matroxfb_setup: option %s\n", this_opt);

if (!strncmp(this_opt, "dev:", 4))
@@ -2467,6 +2465,9 @@ static int __init matroxfb_setup(char *options) {
}
}
}
+
+ option_iter_release(&iter);
+
return 0;
}

--
2.39.2