| Date: | 2012-01-12 19:40:24 (11 years 4 months ago) |
|---|---|
| Author: | Paul Cercueil |
| Commit: | 97f7214eda5bf53c88ee0b25075584587ea891d4 |
| Message: | fbcon: optimize parameters parsing loop. |
| Files: |
drivers/video/console/fbcon.c (5 diffs) |
Change Details
| drivers/video/console/fbcon.c | ||
|---|---|---|
| 441 | 441 | return 1; |
| 442 | 442 | |
| 443 | 443 | while ((options = strsep(&this_opt, ",")) != NULL) { |
| 444 | if (!strncmp(options, "font:", 5)) | |
| 444 | if (!strncmp(options, "font:", 5)) { | |
| 445 | 445 | strlcpy(fontname, options + 5, sizeof(fontname)); |
| 446 | continue; | |
| 447 | } | |
| 446 | 448 | |
| 447 | 449 | if (!strncmp(options, "scrollback:", 11)) { |
| 448 | 450 | char *k; |
| ... | ... | |
| 468 | 470 | /* (k && *k): Check for garbage after the suffix */ |
| 469 | 471 | if (ret || (k && *k)) |
| 470 | 472 | printk(KERN_WARNING "fbcon: scrollback: incorrect value.\n"); |
| 473 | continue; | |
| 471 | 474 | } |
| 472 | 475 | |
| 473 | 476 | if (!strncmp(options, "map:", 4)) { |
| ... | ... | |
| 484 | 487 | } else { |
| 485 | 488 | printk(KERN_WARNING "fbcon: map: incorrect value.\n"); |
| 486 | 489 | } |
| 490 | continue; | |
| 487 | 491 | } |
| 488 | 492 | |
| 489 | 493 | if (!strncmp(options, "vc:", 3)) { |
| ... | ... | |
| 513 | 517 | fbcon_is_default = 0; |
| 514 | 518 | else |
| 515 | 519 | printk(KERN_WARNING "fbcon: vc: incorrect value.\n"); |
| 520 | continue; | |
| 516 | 521 | } |
| 517 | 522 | |
| 518 | 523 | if (!strncmp(options, "rotate:", 7)) { |
| ... | ... | |
| 525 | 530 | } else { |
| 526 | 531 | printk(KERN_WARNING "fbcon: rotate: incorrect value.\n"); |
| 527 | 532 | } |
| 533 | continue; | |
| 528 | 534 | } |
| 529 | 535 | } |
| 530 | 536 | 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
