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 018/101] fbdev/controlfb: 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/controlfb.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
    index 82eeb139c4eb..65e2f9949420 100644
    --- a/drivers/video/fbdev/controlfb.c
    +++ b/drivers/video/fbdev/controlfb.c
    @@ -31,6 +31,7 @@
    * more details.
    */

    +#include <linux/cmdline.h>
    #include <linux/kernel.h>
    #include <linux/errno.h>
    #include <linux/string.h>
    @@ -795,14 +796,14 @@ static void __init control_init_info(struct fb_info *info, struct fb_info_contro
    /*
    * Parse user specified options (`video=controlfb:')
    */
    -static void __init control_setup(char *options)
    +static void __init control_setup(const char *options)
    {
    + struct option_iter iter;
    char *this_opt;

    - if (!options || !*options)
    - return;
    + 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 &&
    @@ -830,6 +831,8 @@ static void __init control_setup(char *options)
    }
    }
    }
    +
    + option_iter_release(&iter);
    }

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