aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>2016-12-24 09:09:01 -0500
committerPetr Mladek <pmladek@suse.com>2017-02-08 08:01:36 -0500
commitd9c23523ed98a3acaa0bfd8fef143595d6aa631d (patch)
treee4328e35d30bf71ee4d23b27fe4fe5432412a3e3 /kernel
parentde6fcbdb68b29b475f4e6368cd465fd778ea421f (diff)
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: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 080843148e8d..7180088cbb23 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1558,8 +1558,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
1558 * log_buf[start] to log_buf[end - 1]. 1558 * log_buf[start] to log_buf[end - 1].
1559 * The console_lock must be held. 1559 * The console_lock must be held.
1560 */ 1560 */
1561static void call_console_drivers(int level, 1561static void call_console_drivers(const char *ext_text, size_t ext_len,
1562 const char *ext_text, size_t ext_len,
1563 const char *text, size_t len) 1562 const char *text, size_t len)
1564{ 1563{
1565 struct console *con; 1564 struct console *con;
@@ -1866,8 +1865,7 @@ static ssize_t msg_print_ext_header(char *buf, size_t size,
1866static ssize_t msg_print_ext_body(char *buf, size_t size, 1865static ssize_t msg_print_ext_body(char *buf, size_t size,
1867 char *dict, size_t dict_len, 1866 char *dict, size_t dict_len,
1868 char *text, size_t text_len) { return 0; } 1867 char *text, size_t text_len) { return 0; }
1869static void call_console_drivers(int level, 1868static void call_console_drivers(const char *ext_text, size_t ext_len,
1870 const char *ext_text, size_t ext_len,
1871 const char *text, size_t len) {} 1869 const char *text, size_t len) {}
1872static size_t msg_print_text(const struct printk_log *msg, 1870static size_t msg_print_text(const struct printk_log *msg,
1873 bool syslog, char *buf, size_t size) { return 0; } 1871 bool syslog, char *buf, size_t size) { return 0; }
@@ -2188,7 +2186,6 @@ again:
2188 struct printk_log *msg; 2186 struct printk_log *msg;
2189 size_t ext_len = 0; 2187 size_t ext_len = 0;
2190 size_t len; 2188 size_t len;
2191 int level;
2192 2189
2193 printk_safe_enter_irqsave(flags); 2190 printk_safe_enter_irqsave(flags);
2194 raw_spin_lock(&logbuf_lock); 2191 raw_spin_lock(&logbuf_lock);
@@ -2212,8 +2209,7 @@ skip:
2212 break; 2209 break;
2213 2210
2214 msg = log_from_idx(console_idx); 2211 msg = log_from_idx(console_idx);
2215 level = msg->level; 2212 if (suppress_message_printing(msg->level)) {
2216 if (suppress_message_printing(level)) {
2217 /* 2213 /*
2218 * Skip record we have buffered and already printed 2214 * Skip record we have buffered and already printed
2219 * directly to the console when we received it, and 2215 * directly to the console when we received it, and
@@ -2239,7 +2235,7 @@ skip:
2239 raw_spin_unlock(&logbuf_lock); 2235 raw_spin_unlock(&logbuf_lock);
2240 2236
2241 stop_critical_timings(); /* don't trace print latency */ 2237 stop_critical_timings(); /* don't trace print latency */
2242 call_console_drivers(level, ext_text, ext_len, text, len); 2238 call_console_drivers(ext_text, ext_len, text, len);
2243 start_critical_timings(); 2239 start_critical_timings();
2244 printk_safe_exit_irqrestore(flags); 2240 printk_safe_exit_irqrestore(flags);
2245 2241