Commit d9c23523 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Petr Mladek

printk: drop call_console_drivers() unused param

We do suppress_message_printing() check before we call
call_console_drivers() now, so `level' param is not needed
anymore.

Link: http://lkml.kernel.org/r/20161224140902.1962-2-sergey.senozhatsky@gmail.com
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent de6fcbdb
...@@ -1558,8 +1558,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) ...@@ -1558,8 +1558,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
* log_buf[start] to log_buf[end - 1]. * log_buf[start] to log_buf[end - 1].
* The console_lock must be held. * The console_lock must be held.
*/ */
static void call_console_drivers(int level, static void call_console_drivers(const char *ext_text, size_t ext_len,
const char *ext_text, size_t ext_len,
const char *text, size_t len) const char *text, size_t len)
{ {
struct console *con; struct console *con;
...@@ -1866,8 +1865,7 @@ static ssize_t msg_print_ext_header(char *buf, size_t size, ...@@ -1866,8 +1865,7 @@ static ssize_t msg_print_ext_header(char *buf, size_t size,
static ssize_t msg_print_ext_body(char *buf, size_t size, static ssize_t msg_print_ext_body(char *buf, size_t size,
char *dict, size_t dict_len, char *dict, size_t dict_len,
char *text, size_t text_len) { return 0; } char *text, size_t text_len) { return 0; }
static void call_console_drivers(int level, static void call_console_drivers(const char *ext_text, size_t ext_len,
const char *ext_text, size_t ext_len,
const char *text, size_t len) {} const char *text, size_t len) {}
static size_t msg_print_text(const struct printk_log *msg, static size_t msg_print_text(const struct printk_log *msg,
bool syslog, char *buf, size_t size) { return 0; } bool syslog, char *buf, size_t size) { return 0; }
...@@ -2188,7 +2186,6 @@ void console_unlock(void) ...@@ -2188,7 +2186,6 @@ void console_unlock(void)
struct printk_log *msg; struct printk_log *msg;
size_t ext_len = 0; size_t ext_len = 0;
size_t len; size_t len;
int level;
printk_safe_enter_irqsave(flags); printk_safe_enter_irqsave(flags);
raw_spin_lock(&logbuf_lock); raw_spin_lock(&logbuf_lock);
...@@ -2212,8 +2209,7 @@ void console_unlock(void) ...@@ -2212,8 +2209,7 @@ void console_unlock(void)
break; break;
msg = log_from_idx(console_idx); msg = log_from_idx(console_idx);
level = msg->level; if (suppress_message_printing(msg->level)) {
if (suppress_message_printing(level)) {
/* /*
* Skip record we have buffered and already printed * Skip record we have buffered and already printed
* directly to the console when we received it, and * directly to the console when we received it, and
...@@ -2239,7 +2235,7 @@ void console_unlock(void) ...@@ -2239,7 +2235,7 @@ void console_unlock(void)
raw_spin_unlock(&logbuf_lock); raw_spin_unlock(&logbuf_lock);
stop_critical_timings(); /* don't trace print latency */ stop_critical_timings(); /* don't trace print latency */
call_console_drivers(level, ext_text, ext_len, text, len); call_console_drivers(ext_text, ext_len, text, len);
start_critical_timings(); start_critical_timings();
printk_safe_exit_irqrestore(flags); printk_safe_exit_irqrestore(flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment