From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: [PATCH] checkpatch.pl: Fix checkpatch false positive due to ternary operator break Date: Fri, 9 May 2014 21:41:51 -0700 Message-ID: <1399696911-6550-1-git-send-email-jeffrey.t.kirsher@intel.com> Cc: David Ertman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Jeff Kirsher To: joe@perches.com, akpm@linux-foundation.org Return-path: Received: from mga09.intel.com ([134.134.136.24]:41345 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750871AbaEJEly (ORCPT ); Sat, 10 May 2014 00:41:54 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: David Ertman Using the intuitive breaking of a ternary operator used in the initialization of a variable in its declaration: type var = FOO ? BAR : FEE; is causing a checkpatch warning: "WARNING:SPACING: networking uses a blank line after declarations" Checkpatch is checking for the ternary operators at the beginning of the lines after the initial break like the following: type var = FOO ? BAR : FEE; Change checkpatch so that it is checking fot the correct breaking of ternary operators used in networking variable declaration/initialization. Signed-off-by: Dave Ertman Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- scripts/checkpatch.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 34eb216..baabf1c 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2269,12 +2269,13 @@ sub process { if ($realfile =~ m@^(drivers/net/|net/)@ && $prevline =~ /^\+\s+$Declare\s+$Ident/ && !($prevline =~ /(?:$Compare|$Assignment|$Operators)\s*$/ || - $prevline =~ /(?:\{\s*|\\)$/) && #extended lines + $prevline =~ /(?:\{\s*|\\)$/ || #extended lines + $prevline =~ /(?:[\?\:])$/) && #ternary ops $sline =~ /^\+\s+/ && #Not at char 1 !($sline =~ /^\+\s+$Declare/ || $sline =~ /^\+\s+$Ident\s+$Ident/ || #eg: typedef foo $sline =~ /^\+\s+(?:union|struct|enum|typedef)\b/ || - $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\?\:\(])/ || + $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\(])/ || $sline =~ /^\+\s+\(?\s*(?:$Compare|$Assignment|$Operators)/)) { WARN("SPACING", "networking uses a blank line after declarations\n" . $hereprev); -- 1.9.0