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

    diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c
    index b166b7cfe0e5..3c20f392370a 100644
    --- a/drivers/video/fbdev/valkyriefb.c
    +++ b/drivers/video/fbdev/valkyriefb.c
    @@ -39,6 +39,7 @@
    * more details.
    */

    +#include <linux/cmdline.h>
    #include <linux/module.h>
    #include <linux/kernel.h>
    #include <linux/errno.h>
    @@ -90,7 +91,7 @@ struct fb_info_valkyrie {
    u32 pseudo_palette[16];
    };

    -static int valkyriefb_setup(char*);
    +static int valkyriefb_setup(const char *options);

    static int valkyriefb_check_var(struct fb_var_screeninfo *var,
    struct fb_info *info);
    @@ -545,14 +546,14 @@ static int __init valkyrie_init_info(struct fb_info *info,
    /*
    * Parse user specified options (`video=valkyriefb:')
    */
    -static int __init valkyriefb_setup(char *options)
    +static int __init valkyriefb_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, "vmode:", 6)) {
    int vmode = simple_strtoul(this_opt+6, NULL, 0);
    if (vmode > 0 && vmode <= VMODE_MAX)
    @@ -571,6 +572,9 @@ static int __init valkyriefb_setup(char *options)
    }
    }
    }
    +
    + option_iter_release(&iter);
    +
    return 0;
    }

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