From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org
Cc: Kay Sievers <kay@vrfy.org>
Subject: [PATCH 04/23] printk: Use pointer for console_cmdline indexing
Date: Tue, 16 Oct 2012 23:06:08 -0700 [thread overview]
Message-ID: <1588ed725bf7ec688a3f334a5c601227b602438c.1350449851.git.joe@perches.com> (raw)
In-Reply-To: <cover.1350449851.git.joe@perches.com>
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>
---
kernel/printk/printk.c | 49 +++++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index df5b80f..099c439 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1718,18 +1718,19 @@ static int __add_preferred_console(char *name, int idx, char *options,
* See if this tty is not yet registered, and
* if we have a slot free.
*/
- for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++)
- if (strcmp(console_cmdline[i].name, name) == 0 &&
- console_cmdline[i].index == idx) {
- if (!brl_options)
- selected_console = i;
- return 0;
+ for (i = 0, c = console_cmdline;
+ i < MAX_CMDLINECONSOLES && c->name[0];
+ i++, c++) {
+ if (strcmp(c->name, name) == 0 && c->index == idx) {
+ if (!brl_options)
+ selected_console = i;
+ return 0;
}
+ }
if (i == MAX_CMDLINECONSOLES)
return -E2BIG;
if (!brl_options)
selected_console = i;
- c = &console_cmdline[i];
strlcpy(c->name, name, sizeof(c->name));
c->options = options;
braille_set_options(c, brl_options);
@@ -1802,15 +1803,15 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
struct console_cmdline *c;
int i;
- for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++)
- if (strcmp(console_cmdline[i].name, name) == 0 &&
- console_cmdline[i].index == idx) {
- c = &console_cmdline[i];
- strlcpy(c->name, name_new, sizeof(c->name));
- c->name[sizeof(c->name) - 1] = 0;
- c->options = options;
- c->index = idx_new;
- return i;
+ for (i = 0, c = console_cmdline;
+ i < MAX_CMDLINECONSOLES && c->name[0];
+ i++, c++)
+ if (strcmp(c->name, name) == 0 && c->index == idx) {
+ strlcpy(c->name, name_new, sizeof(c->name));
+ c->name[sizeof(c->name) - 1] = 0;
+ c->options = options;
+ c->index = idx_new;
+ return i;
}
/* not found */
return -1;
@@ -2218,6 +2219,7 @@ void register_console(struct console *newcon)
int i;
unsigned long flags;
struct console *bcon = NULL;
+ struct console_cmdline *c;
/*
* before we register a new CON_BOOT console, make sure we don't
@@ -2265,24 +2267,25 @@ void register_console(struct console *newcon)
* See if this console matches one we selected on
* the command line.
*/
- for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0];
- i++) {
- if (strcmp(console_cmdline[i].name, newcon->name) != 0)
+ for (i = 0, c = console_cmdline;
+ i < MAX_CMDLINECONSOLES && c->name[0];
+ i++, c++) {
+ if (strcmp(c->name, newcon->name) != 0)
continue;
if (newcon->index >= 0 &&
- newcon->index != console_cmdline[i].index)
+ newcon->index != c->index)
continue;
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;
if (newcon->setup &&
newcon->setup(newcon, console_cmdline[i].options) != 0)
break;
newcon->flags |= CON_ENABLED;
- newcon->index = console_cmdline[i].index;
+ newcon->index = c->index;
if (i == selected_console) {
newcon->flags |= CON_CONSDEV;
preferred_console = selected_console;
--
1.7.10.4
next prev parent reply other threads:[~2012-10-17 6:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 6:06 [PATCH 00/23] printk: refactoring Joe Perches
2012-10-17 6:06 ` [PATCH 01/23] printk: Move to separate directory for easier modification Joe Perches
2012-10-17 6:06 ` [PATCH 02/23] printk: Add console_cmdline.h Joe Perches
2012-10-17 6:06 ` [PATCH 03/23] printk: Move braille console support into separate braille.[ch] files Joe Perches
2012-10-17 23:47 ` Samuel Thibault
2012-10-25 0:12 ` Stephen Warren
2012-10-25 0:31 ` Joe Perches
2012-10-25 15:32 ` Stephen Warren
2012-10-17 6:06 ` Joe Perches [this message]
2012-10-17 6:06 ` [PATCH 05/23] printk: rename struct log to struct printk_log Joe Perches
2012-10-17 6:06 ` [PATCH 06/23] printk: Rename log_buf and __LOG_BUF_LEN Joe Perches
2012-10-17 6:06 ` [PATCH 07/23] printk: Rename log_first and log_next variables Joe Perches
2012-10-17 6:06 ` [PATCH 08/23] printk: Rename log_<foo> variables and functions Joe Perches
2012-10-17 6:06 ` [PATCH 09/23] printk: Rename enum log_flags to printk_log_flags Joe Perches
2012-10-17 6:06 ` [PATCH 10/23] printk: Rename log_wait to printk_log_wait Joe Perches
2012-10-17 6:06 ` [PATCH 11/23] printk: Rename logbuf_lock to printk_logbuf_lock Joe Perches
2012-10-17 6:06 ` [PATCH 12/23] printk: Rename clear_seq and clear_idx variables Joe Perches
2012-10-17 6:06 ` [PATCH 13/23] printk: Remove static from printk_ variables Joe Perches
2012-10-17 6:06 ` [PATCH 14/23] printk: Rename LOG_ALIGN to PRINTK_LOG_ALIGN Joe Perches
2012-10-17 6:06 ` [PATCH 15/23] printk: Add and use printk_log.h Joe Perches
2012-10-17 6:06 ` [PATCH 16/23] printk: Add printk_log.c Joe Perches
2012-10-17 6:06 ` [PATCH 17/23] printk: Make wait_queue_head_t printk_log_wait extern Joe Perches
2012-10-17 6:06 ` [PATCH 18/23] printk: Rename and move 2 #defines to printk_log.h Joe Perches
2012-10-17 6:06 ` [PATCH 19/23] printk: Move devkmsg bits to separate file Joe Perches
2012-10-17 6:06 ` [PATCH 20/23] printk: Prefix print_time and msg_print_text with printk_ Joe Perches
2012-10-17 6:06 ` [PATCH 21/23] printk: Move functions printk_print_time and printk_msg_print_text Joe Perches
2012-10-17 6:06 ` [PATCH 22/23] printk: Add printk_syslog.c and .h Joe Perches
2012-10-17 6:06 ` [PATCH 23/23] printk: Move kmsg_dump functions to separate file Joe Perches
2012-10-18 23:16 ` [PATCH 00/23] printk: refactoring Andrew Morton
2012-10-19 0:43 ` Joe Perches
2012-10-19 1:00 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1588ed725bf7ec688a3f334a5c601227b602438c.1350449851.git.joe@perches.com \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=kay@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).