From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751513AbbCSGWm (ORCPT ); Thu, 19 Mar 2015 02:22:42 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:32911 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751081AbbCSGWk (ORCPT ); Thu, 19 Mar 2015 02:22:40 -0400 From: Tom Van Braeckel To: apw@canonical.com, joe@perches.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH] checkpatch: support more uppercase $logFunctions Date: Thu, 19 Mar 2015 07:21:20 +0100 Message-Id: <1426746080-11905-1-git-send-email-tomvanbraeckel@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for uppercase logging function names (so that they may exceed 80 cols) and regroup the matched expressions more logically. Previously, WARN, WARN_RATELIMIT, WARN_ONCE were already supported but many other uppercase logging functions were not and this caused unfixable checkpatch warnings (an example: drivers/bluetooth/btusb.c) Care was taken to avoid being overly broad by adding uppercase logging functions that do not exist (such as VDBG) or by making everything case insensitive. Care was also taken to make sure that previously supported expressions are still matched (such as WARN*) unless they do not exist anywhere in the codebase (such as WARN_once or WARN_ratelimited). Signed-off-by: Tom Van Braeckel --- scripts/checkpatch.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d124359..c5d1388 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -351,8 +351,8 @@ our $typeTypedefs = qr{(?x: our $logFunctions = qr{(?x: printk(?:_ratelimited|_once|)| - (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)| - WARN(?:_RATELIMIT|_ONCE|)| + (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont)(?:_ratelimited|_once|)| + (?:[A-Z0-9]+_){1,2}(?:EMERG|ALERT|CRIT|ERR|WARNING|WARN|NOTICE|INFO|DEBUG|DBG|DEVEL)(?:_RATELIMIT|_ONCE|)| panic| MODULE_[A-Z_]+| seq_vprintf|seq_printf|seq_puts -- 2.1.0