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 036/101] fbdev/imsttfb: 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/imsttfb.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index bea45647184e..1e2b45faa26b 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -17,6 +17,7 @@
*/

#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1560,16 +1561,16 @@ static void imsttfb_remove(struct pci_dev *pdev)

#ifndef MODULE
static int __init
-imsttfb_setup(char *options)
+imsttfb_setup(const char *options)
{
+ struct option_iter iter;
char *this_opt;

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

- while ((this_opt = strsep(&options, ",")) != NULL) {
+ while (option_iter_next(&iter, &this_opt)) {
if (!strncmp(this_opt, "font:", 5)) {
- char *p;
+ const char *p;
int i;

p = this_opt + 5;
@@ -1608,6 +1609,9 @@ imsttfb_setup(char *options)
}
#endif
}
+
+ option_iter_release(&iter);
+
return 0;
}

--
2.39.2
\
 
 \ /
  Last update: 2023-03-27 00:52    [W:0.333 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site