From patchwork Sat Nov 17 11:17:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eilon Greenstein X-Patchwork-Id: 199834 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E775E2C008E for ; Sat, 17 Nov 2012 22:18:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401Ab2KQLSF (ORCPT ); Sat, 17 Nov 2012 06:18:05 -0500 Received: from mms3.broadcom.com ([216.31.210.19]:1682 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750742Ab2KQLSE (ORCPT ); Sat, 17 Nov 2012 06:18:04 -0500 Received: from [10.9.200.133] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Sat, 17 Nov 2012 03:13:50 -0800 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Sat, 17 Nov 2012 03:17:32 -0800 Received: from [10.185.6.73] (lb-tlvb-eilong.il.broadcom.com [10.185.6.73]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id A8D4840FE3; Sat, 17 Nov 2012 03:17:55 -0800 (PST) Message-ID: <1353151057.14327.18.camel@lb-tlvb-eilong.il.broadcom.com> Subject: [PATCH v2] checkpatch: add double empty line check From: "Eilon Greenstein" Reply-to: eilong@broadcom.com To: "Andy Whitcroft" cc: "Joe Perches" , "David Rientjes" , linux-kernel@vger.kernel.org, netdev Date: Sat, 17 Nov 2012 13:17:37 +0200 Organization: Broadcom X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-WSS-ID: 7CB9AEE43P84215914-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Changes from previous attempt: - Use CHK instead of WARN - Issue only one warning per empty lines block Signed-off-by: Eilon Greenstein --- scripts/checkpatch.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 21a9f5d..13d264f 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3579,6 +3579,14 @@ sub process { WARN("EXPORTED_WORLD_WRITABLE", "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr); } + +# check for double empty lines + if ($line =~ /^\+\s*$/ && + ($rawlines[$linenr] =~ /^\s*$/ || + $prevline =~ /^\+?\s*$/ && $rawlines[$linenr] !~ /^\+\s*$/)) { + CHK("DOUBLE_EMPTY_LINE", + "One empty line should be sufficient. Consider removing this one.\n" . $herecurr); + } } # If we have no input at all, then there is nothing to report on