video/fbdev: refactor video= cmdline parsing
Subsystems (2)
PATCH 1/1 video/fbdev: refactor video= cmdline parsing
Make the video_setup() function slightly easier to read by removing the repeated checks for !global. Remove the misleading return value comment while at it.
I'm slightly hesitant to change any of this, but here goes anyway, with hopes that the next person to have to look at this has it a wee bit easier.
--- drivers/video/fbdev/core/fb_cmdline.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/video/fbdev/core/fb_cmdline.c +10 -13
@@ -75,36 +75,33 @@ EXPORT_SYMBOL(fb_get_options);* NOTE: This function is a __setup and __init function. * It only stores the options. Drivers have to call * fb_get_options() as necessary. -* -* Returns zero. -* */ static int __init video_setup (char *options) { -int i, global =0 ; -if (!options || !*options) - global =1 ; + goto out; -if (!global && !strncmp (options,"ofonly" ,6 )) { +if (!strncmp (options,"ofonly" ,6 )) { ofonly =1 ; - global =1 ; + goto out; } -if (!global && !strchr (options,':' )) { - fb_mode_option = options; - global =1 ; - } +if (strchr (options,':' )) { +/* named */ +int i; -if (!global) {for (i =0 ; i <FB_MAX ; i++) {if (video_options[i] ==NULL ) { video_options[i] = options;break ; } } + }else { +/* global */ + fb_mode_option = options; } +out:return 1 ; }__setup ("video=" , video_setup);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Jani Nikula
Make the
video_setup()function slightly easier to read by removing the repeated checks for !global. Remove the misleading return value comment while at it.I'm slightly hesitant to change any of this, but here goes anyway, with hopes that the next person to have to look at this has it a wee bit easier.
Signed-off-by Jani Nikula <[email protected]>
Quoted 62 lines
--- drivers/video/fbdev/core/fb_cmdline.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)drivers/video/fbdev/core/fb_cmdline.c +10
-13@@ -75,36 +75,33 @@ EXPORT_SYMBOL(fb_get_options);* NOTE: This function is a __setup and __init function. * It only stores the options. Drivers have to call * fb_get_options() as necessary. -* -* Returns zero. -* */ static int __init video_setup (char *options) { -int i, global =0 ; -if (!options || !*options) - global =1 ; + goto out; -if (!global && !strncmp (options,"ofonly" ,6 )) { +if (!strncmp (options,"ofonly" ,6 )) { ofonly =1 ; - global =1 ; + goto out; } -if (!global && !strchr (options,':' )) { - fb_mode_option = options; - global =1 ; - } +if (strchr (options,':' )) { +/* named */ +int i; -if (!global) {for (i =0 ; i <FB_MAX ; i++) {if (video_options[i] =NULL ) { video_options[i] = options;break ; } } + }else { +/* global */ + fb_mode_option = options; } +out:return 1 ; }__setup ("video=" , video_setup);Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 5 lines · Daniel Vetter
Quoted 4 lines · Jani Nikula
Make the
video_setup()function slightly easier to read by removing the repeated checks for !global. Remove the misleading return value comment while at it.
Quoted 7 lines
Quoted 5 lines
I'm slightly hesitant to change any of this, but here goes anyway, with hopes that the next person to have to look at this has it a wee bit easier.
Signed-off-by Jani Nikula <[email protected]>Reviewed-by Daniel Vetter <[email protected]>
Thanks.
Just to be clear, I expect Bartlomiej to queue this via the fb tree (provided he agrees with the change, of course).
BR,
Jani.
Quoted 63 lines
Quoted 63 lines
--- drivers/video/fbdev/core/fb_cmdline.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)drivers/video/fbdev/core/fb_cmdline.c +10
-13@@ -75,36 +75,33 @@ EXPORT_SYMBOL(fb_get_options);* NOTE: This function is a __setup and __init function. * It only stores the options. Drivers have to call * fb_get_options() as necessary. -* -* Returns zero. -* */ static int __init video_setup (char *options) { -int i, global =0 ; -if (!options || !*options) - global =1 ; + goto out; -if (!global && !strncmp (options,"ofonly" ,6 )) { +if (!strncmp (options,"ofonly" ,6 )) { ofonly =1 ; - global =1 ; + goto out; } -if (!global && !strchr (options,':' )) { - fb_mode_option = options; - global =1 ; - } +if (strchr (options,':' )) { +/* named */ +int i; -if (!global) {for (i =0 ; i <FB_MAX ; i++) {if (video_options[i] ==NULL ) { video_options[i] = options;break ; } } + }else { +/* global */ + fb_mode_option = options; } +out:return 1 ; }__setup ("video=" , video_setup);Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Jani Nikula
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Jani Nikula
Make the
video_setup()function slightly easier to read by removing the repeated checks for !global. Remove the misleading return value comment while at it.I'm slightly hesitant to change any of this, but here goes anyway, with hopes that the next person to have to look at this has it a wee bit easier.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Jani Nikula <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Thanks.
Just to be clear, I expect Bartlomiej to queue this via the fb tree (provided he agrees with the change, of course).
Patch queued for v5.1, thanks.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics