From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754586Ab3GYDbz (ORCPT ); Wed, 24 Jul 2013 23:31:55 -0400 Received: from perches-mx.perches.com ([206.117.179.246]:50548 "EHLO labridge.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753343Ab3GYDby (ORCPT ); Wed, 24 Jul 2013 23:31:54 -0400 Message-ID: <1374723112.1924.41.camel@joe-AO722> Subject: [PATCH] checkpatch: Fix networking kernel-doc block comment defect From: Joe Perches To: Andrew Morton , Darren Hart Cc: David Miller , netdev@vger.kernel.org, LKML , Andy Whitcroft Date: Wed, 24 Jul 2013 20:31:52 -0700 In-Reply-To: <1374722064.3436.252.camel@dvhart-mobl1.amr.corp.intel.com> References: <79241b53ec4e638008ba3384958ef9901ad11338.1374525261.git.dvhart@linux.intel.com> <20130724.170008.924195436945641752.davem@davemloft.net> <1374711603.3436.246.camel@dvhart-mobl1.amr.corp.intel.com> <1374712895.1924.13.camel@joe-AO722> <1374721094.3436.249.camel@dvhart-mobl1.amr.corp.intel.com> <1374721731.1924.34.camel@joe-AO722> <1374722064.3436.252.camel@dvhart-mobl1.amr.corp.intel.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.6.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org checkpatch can generate a false positive when inserting a new kernel-doc block and function above an existing kernel-doc block. Fix it by checking that the context line is also a newly inserted line. Reported-by: Darren Hart Signed-off-by: Joe Perches --- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 23126d4..c18e1be 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2074,6 +2074,7 @@ sub process { if ($realfile =~ m@^(drivers/net/|net/)@ && $prevrawline =~ /^\+[ \t]*\/\*/ && #starting /* $prevrawline !~ /\*\/[ \t]*$/ && #no trailing */ + $rawline =~ /^\+/ && #line is new $rawline !~ /^\+[ \t]*\*/) { #no leading * WARN("NETWORKING_BLOCK_COMMENT_STYLE", "networking block comments start with * on subsequent lines\n" . $hereprev); -- 1.8.1.2.459.gbcd45b4.dirty