[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230306160016.4459-37-tzimmermann@suse.de>
Date: Mon, 6 Mar 2023 16:59:13 +0100
From: Thomas Zimmermann <tzimmermann@...e.de>
To: deller@....de, paulus@...ba.org, benh@...nel.crashing.org,
linux@...linux.org.uk, pjones@...hat.com, timur@...nel.org,
adaplas@...il.com, s.hauer@...gutronix.de, shawnguo@...nel.org,
mbroemme@...mpq.org, thomas@...ischhofer.net,
James.Bottomley@...senPartnership.com, spock@...too.org,
sudipm.mukherjee@...il.com, teddy.wang@...iconmotion.com,
geert+renesas@...der.be, corbet@....net
Cc: linux-fbdev@...r.kernel.org, dri-devel@...ts.freedesktop.org,
linux-kernel@...r.kernel.org,
Thomas Zimmermann <tzimmermann@...e.de>
Subject: [PATCH 36/99] fbdev/imsttfb: Parse option string with struct option_iter
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@...e.de>
---
drivers/video/fbdev/imsttfb.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index bea45647184e..fc046886599c 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)
{
- char *this_opt;
+ struct option_iter iter;
+ const 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
Powered by blists - more mailing lists