lkml.org 
[lkml]   [2023]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 083/101] fbdev/tgafb: Parse option string with struct option_iter
Date
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/tgafb.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index cf00b8a91bfb..0862d9a54aef 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c
@@ -14,6 +14,7 @@

#include <linux/aperture.h>
#include <linux/bitrev.h>
+#include <linux/cmdline.h>
#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/device.h>
@@ -1573,25 +1574,24 @@ static void tgafb_exit(void)
}

#ifndef MODULE
-static int tgafb_setup(char *arg)
+static int tgafb_setup(const char *arg)
{
+ struct option_iter iter;
char *this_opt;

- if (arg && *arg) {
- while ((this_opt = strsep(&arg, ","))) {
- if (!*this_opt)
- continue;
- if (!strncmp(this_opt, "mode:", 5)) {
- kfree(mode_option_buf);
- mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
- mode_option = mode_option_buf;
- } else
- printk(KERN_ERR
- "tgafb: unknown parameter %s\n",
- this_opt);
- }
+ option_iter_init(&iter, arg);
+
+ while (option_iter_next(&iter, &this_opt)) {
+ if (!strncmp(this_opt, "mode:", 5)) {
+ kfree(mode_option_buf);
+ mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
+ mode_option = mode_option_buf;
+ } else
+ printk(KERN_ERR "tgafb: unknown parameter %s\n", this_opt);
}

+ option_iter_release(&iter);
+
return 0;
}
#endif /* !MODULE */
--
2.39.2
\
 
 \ /
  Last update: 2023-03-27 00:52    [W:0.356 / U:0.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site