android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

printk: use pointer for console_cmdline indexing

Browse Source 
Make the code a bit more compact by always using a pointer for the active
console_cmdline.

Move overly indented code to correct indent level.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2013-07-31 13:53:46 -07:00 committed by Linus Torvalds
parent bbeddf52ad
commit 23475408c6
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
kernel/printk/printk.c
View File

@ -1756,18 +1756,19 @@ static int __add_preferred_console(char *name, int idx, char *options,
* See if this tty is not yet registered, and * See if this tty is not yet registered, and
* if we have a slot free. * if we have a slot free.
*/ */
for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++) for (i = 0, c = console_cmdline;
if (strcmp(console_cmdline[i].name, name) == 0 && i < MAX_CMDLINECONSOLES && c->name[0];
console_cmdline[i].index == idx) { i++, c++) {
if (!brl_options) if (strcmp(c->name, name) == 0 && c->index == idx) {
selected_console = i; if (!brl_options)
return 0; selected_console = i;
return 0;
} }
}
if (i == MAX_CMDLINECONSOLES) if (i == MAX_CMDLINECONSOLES)
return -E2BIG; return -E2BIG;
if (!brl_options) if (!brl_options)
selected_console = i; selected_console = i;
c = &console_cmdline[i];
strlcpy(c->name, name, sizeof(c->name)); strlcpy(c->name, name, sizeof(c->name));
c->options = options; c->options = options;
braille_set_options(c, brl_options); braille_set_options(c, brl_options);
@ -1840,15 +1841,15 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
struct console_cmdline *c; struct console_cmdline *c;
int i; int i;
for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++) for (i = 0, c = console_cmdline;
if (strcmp(console_cmdline[i].name, name) == 0 && i < MAX_CMDLINECONSOLES && c->name[0];
console_cmdline[i].index == idx) { i++, c++)
c = &console_cmdline[i]; if (strcmp(c->name, name) == 0 && c->index == idx) {
strlcpy(c->name, name_new, sizeof(c->name)); strlcpy(c->name, name_new, sizeof(c->name));
c->name[sizeof(c->name) - 1] = 0; c->name[sizeof(c->name) - 1] = 0;
c->options = options; c->options = options;
c->index = idx_new; c->index = idx_new;
return i; return i;
} }
/* not found */ /* not found */
return -1; return -1;
@ -2223,6 +2224,7 @@ void register_console(struct console *newcon)
int i; int i;
unsigned long flags; unsigned long flags;
struct console *bcon = NULL; struct console *bcon = NULL;
struct console_cmdline *c;
/* /*
* before we register a new CON_BOOT console, make sure we don't * before we register a new CON_BOOT console, make sure we don't
@ -2270,24 +2272,25 @@ void register_console(struct console *newcon)
* See if this console matches one we selected on * See if this console matches one we selected on
* the command line. * the command line.
*/ */
for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; for (i = 0, c = console_cmdline;
i++) { i < MAX_CMDLINECONSOLES && c->name[0];
if (strcmp(console_cmdline[i].name, newcon->name) != 0) i++, c++) {
if (strcmp(c->name, newcon->name) != 0)
continue; continue;
if (newcon->index >= 0 && if (newcon->index >= 0 &&
newcon->index != console_cmdline[i].index) newcon->index != c->index)
continue; continue;
if (newcon->index < 0) if (newcon->index < 0)
newcon->index = console_cmdline[i].index; newcon->index = c->index;
if (_braille_register_console(newcon, &console_cmdline[i])) if (_braille_register_console(newcon, c))
return; return;
if (newcon->setup && if (newcon->setup &&
newcon->setup(newcon, console_cmdline[i].options) != 0) newcon->setup(newcon, console_cmdline[i].options) != 0)
break; break;
newcon->flags |= CON_ENABLED; newcon->flags |= CON_ENABLED;
newcon->index = console_cmdline[i].index; newcon->index = c->index;
if (i == selected_console) { if (i == selected_console) {
newcon->flags |= CON_CONSDEV; newcon->flags |= CON_CONSDEV;
preferred_console = selected_console; preferred_console = selected_console;