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.
v2:
* add missing call to option_iter_release()
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/video/fbdev/geode/gx1fb_core.c | 14 +++++++-------
drivers/video/fbdev/geode/gxfb_core.c | 15 +++++++--------
drivers/video/fbdev/geode/lxfb_core.c | 14 +++++++-------
3 files changed, 21 insertions(+), 22 deletions(-)
@@ -7,6 +7,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -403,17 +404,14 @@ static void gx1fb_remove(struct pci_dev *pdev)
}
#ifndef MODULE
-static void __init gx1fb_setup(char *options)
+static void __init gx1fb_setup(const char *options)
{
+ struct option_iter iter;
char *this_opt;
- if (!options || !*options)
- return;
-
- while ((this_opt = strsep(&options, ","))) {
- if (!*this_opt)
- continue;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &this_opt)) {
if (!strncmp(this_opt, "mode:", 5))
strscpy(mode_option, this_opt + 5, sizeof(mode_option));
else if (!strncmp(this_opt, "crt:", 4))
@@ -423,6 +421,8 @@ static void __init gx1fb_setup(char *options)
else
strscpy(mode_option, this_opt, sizeof(mode_option));
}
+
+ option_iter_release(&iter);
}
#endif
@@ -16,6 +16,7 @@
* 16 MiB of framebuffer memory is assumed to be available.
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -489,23 +490,21 @@ static struct pci_driver gxfb_driver = {
};
#ifndef MODULE
-static int __init gxfb_setup(char *options)
+static int __init gxfb_setup(const char *options)
{
-
+ struct option_iter iter;
char *opt;
- if (!options || !*options)
- return 0;
-
- while ((opt = strsep(&options, ",")) != NULL) {
- if (!*opt)
- continue;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &opt)) {
kfree(mode_option_buf);
mode_option_buf = kstrdup(opt, GFP_KERNEL); // ignore errors
mode_option = mode_option_buf;
}
+ option_iter_release(&iter);
+
return 0;
}
#endif
@@ -7,6 +7,7 @@
*/
#include <linux/aperture.h>
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -619,17 +620,14 @@ static struct pci_driver lxfb_driver = {
};
#ifndef MODULE
-static int __init lxfb_setup(char *options)
+static int __init lxfb_setup(const char *options)
{
+ struct option_iter iter;
char *opt;
- if (!options || !*options)
- return 0;
-
- while ((opt = strsep(&options, ",")) != NULL) {
- if (!*opt)
- continue;
+ option_iter_init(&iter, options);
+ while (option_iter_next(&iter, &opt)) {
if (!strcmp(opt, "noclear"))
noclear = 1;
else if (!strcmp(opt, "nopanel"))
@@ -643,6 +641,8 @@ static int __init lxfb_setup(char *options)
}
}
+ option_iter_release(&iter);
+
return 0;
}
#endif