Skip to content

Commit d9c2352

Browse files
sergey-senozhatskypmladek
authored andcommitted
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>
1 parent de6fcbd commit d9c2352

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

kernel/printk/printk.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,8 +1558,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
15581558
* log_buf[start] to log_buf[end - 1].
15591559
* The console_lock must be held.
15601560
*/
1561-
static void call_console_drivers(int level,
1562-
const char *ext_text, size_t ext_len,
1561+
static void call_console_drivers(const char *ext_text, size_t ext_len,
15631562
const char *text, size_t len)
15641563
{
15651564
struct console *con;
@@ -1866,8 +1865,7 @@ static ssize_t msg_print_ext_header(char *buf, size_t size,
18661865
static ssize_t msg_print_ext_body(char *buf, size_t size,
18671866
char *dict, size_t dict_len,
18681867
char *text, size_t text_len) { return 0; }
1869-
static void call_console_drivers(int level,
1870-
const char *ext_text, size_t ext_len,
1868+
static void call_console_drivers(const char *ext_text, size_t ext_len,
18711869
const char *text, size_t len) {}
18721870
static size_t msg_print_text(const struct printk_log *msg,
18731871
bool syslog, char *buf, size_t size) { return 0; }
@@ -2188,7 +2186,6 @@ void console_unlock(void)
21882186
struct printk_log *msg;
21892187
size_t ext_len = 0;
21902188
size_t len;
2191-
int level;
21922189

21932190
printk_safe_enter_irqsave(flags);
21942191
raw_spin_lock(&logbuf_lock);
@@ -2212,8 +2209,7 @@ void console_unlock(void)
22122209
break;
22132210

22142211
msg = log_from_idx(console_idx);
2215-
level = msg->level;
2216-
if (suppress_message_printing(level)) {
2212+
if (suppress_message_printing(msg->level)) {
22172213
/*
22182214
* Skip record we have buffered and already printed
22192215
* directly to the console when we received it, and
@@ -2239,7 +2235,7 @@ void console_unlock(void)
22392235
raw_spin_unlock(&logbuf_lock);
22402236

22412237
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);
22432239
start_critical_timings();
22442240
printk_safe_exit_irqrestore(flags);
22452241

0 commit comments

Comments
 (0)