From patchwork Thu Jul 10 13:01:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 33423 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 12190203C0 for ; Thu, 10 Jul 2014 13:02:27 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id j17sf49932116oag.4 for ; Thu, 10 Jul 2014 06:02:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=MXXfn4DZ9gtkEmuh7Ub9Edq4Nvek98zyujNoILxUw/0=; b=jE/aJ3kmcysnGIxyJ8NqYJpWW+L1xOCh8dhvRHjY2Yk2uB8i/QWQSS6FoxAcZkflSD Lk5UzR+naDdmA8B5x+P17xf3iLmoSgjWVjXqiuiacvCNhIf8ttfAYq7JVqzFQL3KTaE6 Ihpm4p+cZxsweQJDUfcoXZ80CcR5FyhccUl8Ns/7faWTRgRLtfHus7vcUmuFnXbIZvyo Mmge77N9edKSNryjni3+v6DluY8tc4vTbORF+wpe60RAvdi9v/2BeYvAhydmnu4Lx5OL MN2Kzi0VOWl6aNEKZeJ/NBcFyjyFRHNMe/NlC0m3eWw86qmu+W4NRGC8YaT1W59IGsYP 6W4w== X-Gm-Message-State: ALoCoQmmjGPbLQ2od/rnESkK+ecLPHpR6xAbznJfA+/iPzUPub4Z3/rgipxRSBC4CIxXPsyKkyEP X-Received: by 10.43.145.198 with SMTP id jv6mr21562018icc.19.1404997346588; Thu, 10 Jul 2014 06:02:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.72 with SMTP id k66ls57620qgd.96.gmail; Thu, 10 Jul 2014 06:02:26 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr45500463vec.4.1404997346457; Thu, 10 Jul 2014 06:02:26 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id zl10si12816615vdb.43.2014.07.10.06.02.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jul 2014 06:02:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so10422661vcb.16 for ; Thu, 10 Jul 2014 06:02:26 -0700 (PDT) X-Received: by 10.220.68.140 with SMTP id v12mr44850225vci.13.1404997346364; Thu, 10 Jul 2014 06:02:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp130851vcb; Thu, 10 Jul 2014 06:02:25 -0700 (PDT) X-Received: by 10.70.98.225 with SMTP id el1mr17097345pdb.63.1404997345502; Thu, 10 Jul 2014 06:02:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kr7si48533552pab.13.2014.07.10.06.02.22; Thu, 10 Jul 2014 06:02:22 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753633AbaGJNB5 (ORCPT + 28 others); Thu, 10 Jul 2014 09:01:57 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:48035 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753535AbaGJNB3 (ORCPT ); Thu, 10 Jul 2014 09:01:29 -0400 Received: by mail-ig0-f178.google.com with SMTP id hn18so3029751igb.5 for ; Thu, 10 Jul 2014 06:01:29 -0700 (PDT) X-Received: by 10.42.32.136 with SMTP id e8mr54543789icd.44.1404997289254; Thu, 10 Jul 2014 06:01:29 -0700 (PDT) Received: from localhost.localdomain (c-24-245-18-91.hsd1.mn.comcast.net. [24.245.18.91]) by mx.google.com with ESMTPSA id d4sm24960026igc.5.2014.07.10.06.01.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jul 2014 06:01:28 -0700 (PDT) From: Alex Elder To: akpm@linux-foundation.org Cc: ak@linux.intel.com, bp@suse.de, jack@suse.cz, john.stultz@linaro.org, pmladek@suse.cz, rostedt@goodmis.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] printk: miscellaneous cleanups Date: Thu, 10 Jul 2014 08:01:24 -0500 Message-Id: <1404997284-20844-5-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404997284-20844-1-git-send-email-elder@linaro.org> References: <1404997284-20844-1-git-send-email-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch contains some small cleanups to kernel/printk/printk.c. None of them should cause any change in behavior. - When CONFIG_PRINTK is defined, parenthesize the value of LOG_LINE_MAX. - When CONFIG_PRINTK is *not* defined, there is an extra LOG_LINE_MAX definition; delete it. - Pull an assignment out of a conditional expression in console_setup(). - Use isdigit() in console_setup() rather than open coding it. - In update_console_cmdline(), drop a NUL-termination assignment; the strlcpy() call that precedes it guarantees it's not needed. - Simplify some logic in printk_timed_ratelimit(). Signed-off-by: Alex Elder Reviewed-by: Petr Mladek --- kernel/printk/printk.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 6f75e8a..909029e 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -45,6 +45,7 @@ #include #include #include +#include #include @@ -257,7 +258,7 @@ static u64 clear_seq; static u32 clear_idx; #define PREFIX_MAX 32 -#define LOG_LINE_MAX 1024 - PREFIX_MAX +#define LOG_LINE_MAX (1024 - PREFIX_MAX) /* record buffer */ #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) @@ -1794,7 +1795,7 @@ EXPORT_SYMBOL(printk); #define LOG_LINE_MAX 0 #define PREFIX_MAX 0 -#define LOG_LINE_MAX 0 + static u64 syslog_seq; static u32 syslog_idx; static u64 console_seq; @@ -1895,7 +1896,8 @@ static int __init console_setup(char *str) strncpy(buf, str, sizeof(buf) - 1); } buf[sizeof(buf) - 1] = 0; - if ((options = strchr(str, ',')) != NULL) + options = strchr(str, ','); + if (options) *(options++) = 0; #ifdef __sparc__ if (!strcmp(str, "ttya")) @@ -1904,7 +1906,7 @@ static int __init console_setup(char *str) strcpy(buf, "ttyS1"); #endif for (s = buf; *s; s++) - if ((*s >= '0' && *s <= '9') || *s == ',') + if (isdigit(*s) || *s == ',') break; idx = simple_strtoul(s, NULL, 10); *s = 0; @@ -1943,7 +1945,6 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha 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; @@ -2611,14 +2612,13 @@ EXPORT_SYMBOL(__printk_ratelimit); bool printk_timed_ratelimit(unsigned long *caller_jiffies, unsigned int interval_msecs) { - if (*caller_jiffies == 0 - || !time_in_range(jiffies, *caller_jiffies, - *caller_jiffies - + msecs_to_jiffies(interval_msecs))) { - *caller_jiffies = jiffies; - return true; - } - return false; + unsigned long elapsed = jiffies - *caller_jiffies; + + if (*caller_jiffies && elapsed <= msecs_to_jiffies(interval_msecs)) + return false; + + *caller_jiffies = jiffies; + return true; } EXPORT_SYMBOL(printk_timed_ratelimit);