lkml.org 
[lkml]   [2023]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 45/99] fbdev/matroxfb: 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/matrox/matroxfb_base.c | 19 ++++++++++---------
    1 file changed, 10 insertions(+), 9 deletions(-)

    diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
    index a043a737ea9f..f690ee0c9b1f 100644
    --- a/drivers/video/fbdev/matrox/matroxfb_base.c
    +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
    @@ -101,6 +101,7 @@
    */

    #include <linux/aperture.h>
    +#include <linux/cmdline.h>
    #include <linux/version.h>

    #include "matroxfb_base.h"
    @@ -2333,17 +2334,14 @@ static void __exit matrox_done(void) {

    /* ************************* init in-kernel code ************************** */

    -static int __init matroxfb_setup(char *options) {
    - char *this_opt;
    -
    - DBG(__func__)
    -
    - if (!options || !*options)
    - return 0;
    +static int __init matroxfb_setup(const char *options)
    +{
    + struct option_iter iter;
    + const char *this_opt;

    - while ((this_opt = strsep(&options, ",")) != NULL) {
    - if (!*this_opt) continue;
    + option_iter_init(&iter, options);

    + while (option_iter_next(&iter, this_opt)) {
    dprintk("matroxfb_setup: option %s\n", this_opt);

    if (!strncmp(this_opt, "dev:", 4))
    @@ -2467,6 +2465,9 @@ static int __init matroxfb_setup(char *options) {
    }
    }
    }
    +
    + option_iter_release(&iter);
    +
    return 0;
    }

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