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 042/101] fbdev/kyrofb: 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/kyro/fbdev.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/kyro/fbdev.c b/drivers/video/fbdev/kyro/fbdev.c
index 97f4d8995e36..ccfec4e55ecf 100644
--- a/drivers/video/fbdev/kyro/fbdev.c
+++ b/drivers/video/fbdev/kyro/fbdev.c
@@ -10,6 +10,7 @@
*/

#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@ -563,16 +564,14 @@ static int kyrofb_setcolreg(u_int regno, u_int red, u_int green,
}

#ifndef MODULE
-static int __init kyrofb_setup(char *options)
+static int __init kyrofb_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, ","))) {
- if (!*this_opt)
- continue;
+ while (option_iter_next(&iter, &this_opt)) {
if (strcmp(this_opt, "nopan") == 0) {
nopan = 1;
} else if (strcmp(this_opt, "nowrap") == 0) {
@@ -586,6 +585,8 @@ static int __init kyrofb_setup(char *options)
}
}

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