lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/video/fbmem.c: simplify strlen()==0 check in fb_get_options()

Browse Source 
Replaced !strlen(str) check with !str[0].  Removed the variable which was
used solely to store strlen result.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Denys Vlasenko
2010-08-10 18:02:30 -07:00
committed by Linus Torvalds
parent 26c5be3c75
commit a67ef278e2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/fbmem.c
View File

@@ -1786,7 +1786,7 @@ static int ofonly __read_mostly;
int fb_get_options(char *name, char **option) int fb_get_options(char *name, char **option)
{ {
char *opt, *options = NULL; char *opt, *options = NULL;
int opt_len, retval = 0; int retval = 0;
int name_len = strlen(name), i; int name_len = strlen(name), i;
if (name_len && ofonly && strncmp(name, "offb", 4)) if (name_len && ofonly && strncmp(name, "offb", 4))
@@ -1796,8 +1796,7 @@ int fb_get_options(char *name, char **option)
for (i = 0; i < FB_MAX; i++) { for (i = 0; i < FB_MAX; i++) {
if (video_options[i] == NULL) if (video_options[i] == NULL)
continue; continue;
opt_len = strlen(video_options[i]); if (!video_options[i][0])
if (!opt_len)
continue; continue;
opt = video_options[i]; opt = video_options[i];
if (!strncmp(name, opt, name_len) && if (!strncmp(name, opt, name_len) &&