@@ -32,6 +32,7 @@
* All Rights Reserved
*/
+#include <linux/cmdline.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@@ -2011,23 +2012,26 @@ static int parse_opt(struct device *dev, char *this_opt,
return 0;
}
-static int pxafb_parse_options(struct device *dev, char *options,
+static int pxafb_parse_options(struct device *dev, const char *options,
struct pxafb_mach_info *inf)
{
- char *this_opt;
+ struct option_iter iter;
+ const char *this_opt;
int ret;
- if (!options || !*options)
- return 0;
-
dev_dbg(dev, "options are \"%s\"\n", options ? options : "null");
- /* could be made table driven or similar?... */
- while ((this_opt = strsep(&options, ",")) != NULL) {
+ option_iter_init(&iter, options);
+
+ while (option_iter_next(&iter, this_opt)) {
+ /* could be made table driven or similar?... */
ret = parse_opt(dev, this_opt, inf);
if (ret)
return ret;
}
+
+ option_iter_release(&iter);
+
return 0;
}
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/pxafb.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)