From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755359AbcLXOK6 (ORCPT ); Sat, 24 Dec 2016 09:10:58 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35993 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754189AbcLXOKW (ORCPT ); Sat, 24 Dec 2016 09:10:22 -0500 From: Sergey Senozhatsky To: Andrew Morton Cc: Petr Mladek , Steven Rostedt , Peter Hurley , linux-kernel@vger.kernel.org, Sergey Senozhatsky , Sergey Senozhatsky Subject: [PATCH 1/2] printk: drop call_console_drivers() unused param Date: Sat, 24 Dec 2016 23:09:01 +0900 Message-Id: <20161224140902.1962-2-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161224140902.1962-1-sergey.senozhatsky@gmail.com> References: <20161224140902.1962-1-sergey.senozhatsky@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We do suppress_message_printing() check before we call call_console_drivers() now, so `level' param is not needed anymore. Signed-off-by: Sergey Senozhatsky --- kernel/printk/printk.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index e2cdd87e7a63..11a9842a2f47 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1510,8 +1510,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) * log_buf[start] to log_buf[end - 1]. * The console_lock must be held. */ -static void call_console_drivers(int level, - const char *ext_text, size_t ext_len, +static void call_console_drivers(const char *ext_text, size_t ext_len, const char *text, size_t len) { struct console *con; @@ -1895,8 +1894,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, char *dict, size_t dict_len, char *text, size_t text_len) { return 0; } -static void call_console_drivers(int level, - const char *ext_text, size_t ext_len, +static void call_console_drivers(const char *ext_text, size_t ext_len, const char *text, size_t len) {} static size_t msg_print_text(const struct printk_log *msg, bool syslog, char *buf, size_t size) { return 0; } @@ -2220,7 +2218,6 @@ void console_unlock(void) struct printk_log *msg; size_t ext_len = 0; size_t len; - int level; raw_spin_lock_irqsave(&logbuf_lock, flags); if (seen_seq != log_next_seq) { @@ -2243,8 +2240,7 @@ void console_unlock(void) break; msg = log_from_idx(console_idx); - level = msg->level; - if (suppress_message_printing(level)) { + if (suppress_message_printing(msg->level)) { /* * Skip record we have buffered and already printed * directly to the console when we received it, and @@ -2270,7 +2266,7 @@ void console_unlock(void) raw_spin_unlock(&logbuf_lock); 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(); local_irq_restore(flags); -- 2.11.0