Date: | 2012-01-12 19:40:24 (12 years 2 months ago) |
---|---|
Author: | Paul Cercueil |
Commit: | b4105ec8d213ed09405ae4dff128d7cd9dfa7d53 |
Message: | fbcon: optimize parameters parsing loop. |
Files: |
drivers/video/console/fbcon.c (5 diffs) |
Change Details
drivers/video/console/fbcon.c | ||
---|---|---|
442 | 442 | return 1; |
443 | 443 | |
444 | 444 | while ((options = strsep(&this_opt, ",")) != NULL) { |
445 | if (!strncmp(options, "font:", 5)) | |
445 | if (!strncmp(options, "font:", 5)) { | |
446 | 446 | strlcpy(fontname, options + 5, sizeof(fontname)); |
447 | continue; | |
448 | } | |
447 | 449 | |
448 | 450 | if (!strncmp(options, "scrollback:", 11)) { |
449 | 451 | char *k; |
... | ... | |
469 | 471 | /* (k && *k): Check for garbage after the suffix */ |
470 | 472 | if (ret || (k && *k)) |
471 | 473 | printk(KERN_WARNING "fbcon: scrollback: incorrect value.\n"); |
474 | continue; | |
472 | 475 | } |
473 | 476 | |
474 | 477 | if (!strncmp(options, "map:", 4)) { |
... | ... | |
485 | 488 | } else { |
486 | 489 | printk(KERN_WARNING "fbcon: map: incorrect value.\n"); |
487 | 490 | } |
491 | continue; | |
488 | 492 | } |
489 | 493 | |
490 | 494 | if (!strncmp(options, "vc:", 3)) { |
... | ... | |
514 | 518 | fbcon_is_default = 0; |
515 | 519 | else |
516 | 520 | printk(KERN_WARNING "fbcon: vc: incorrect value.\n"); |
521 | continue; | |
517 | 522 | } |
518 | 523 | |
519 | 524 | if (!strncmp(options, "rotate:", 7)) { |
... | ... | |
526 | 531 | } else { |
527 | 532 | printk(KERN_WARNING "fbcon: rotate: incorrect value.\n"); |
528 | 533 | } |
534 | continue; | |
529 | 535 | } |
530 | 536 | } |
531 | 537 | return 1; |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9