linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Julia Lawall <julia.lawall@inria.fr>,
	trix@redhat.com, linux-kernel@vger.kernel.org,
	cocci <cocci@systeme.lip6.fr>
Subject: [PATCH V2] checkpatch: Allow --fix removal of unnecessary break statements
Date: Mon, 19 Oct 2020 08:36:08 -0700	[thread overview]
Message-ID: <d9ea654104d55f590fb97d252d64a66b23c1a096.camel@perches.com> (raw)
In-Reply-To: <alpine.DEB.2.22.394.2010172016370.9440@hadrien>

switch/case use of break after a return, goto or break is unnecessary.

There is an existing warning for the return and goto uses, so add
break and a --fix option too.

Signed-off-by: Joe Perches <joe@perches.com>
---

v2: Add break to matched keyword
    and change the message to show the matched keyword
 
For today's next, this would remove ~300 instances like:

	case FOO:
		return bar;
		break;
or
	case FOO:
		goto bar;
		break;

 scripts/checkpatch.pl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index fab38b493cef..b0597853c16e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3674,12 +3674,16 @@ sub process {
 		}
 
 # check indentation of a line with a break;
-# if the previous line is a goto or return and is indented the same # of tabs
+# if the previous line is a goto, return or break
+# and is indented the same # of tabs
 		if ($sline =~ /^\+([\t]+)break\s*;\s*$/) {
 			my $tabs = $1;
-			if ($prevline =~ /^\+$tabs(?:goto|return)\b/) {
-				WARN("UNNECESSARY_BREAK",
-				     "break is not useful after a goto or return\n" . $hereprev);
+			if ($prevline =~ /^\+$tabs(goto|return|break)\b/) {
+				if (WARN("UNNECESSARY_BREAK",
+					 "break is not useful after a $1\n" . $hereprev) &&
+				    $fix) {
+					fix_delete_line($fixlinenr, $rawline);
+				}
 			}
 		}
 



  parent reply	other threads:[~2020-10-19 15:36 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-17 16:09 [RFC] treewide: cleanup unreachable breaks trix
2020-10-17 16:24 ` Martin Blumenstingl
2020-10-17 16:24 ` Joe Perches
2020-10-17 18:21   ` [Cocci] " Julia Lawall
2020-10-17 19:00     ` Joe Perches
2020-10-18 19:49     ` [PATCH] checkpatch: Allow --fix removal of unnecessary break statements Joe Perches
2020-10-18 20:07       ` Tom Rix
2020-10-18 20:19         ` Joe Perches
2020-10-19 12:55           ` Tom Rix
2020-10-19 15:16             ` Joe Perches
2020-10-19 15:36     ` Joe Perches [this message]
2020-10-17 21:01 ` [RFC] treewide: cleanup unreachable breaks Dan Williams
2020-10-18  5:43 ` Greg KH
2020-10-18 14:04   ` Tom Rix
2020-10-19 19:42   ` Nick Desaulniers
2020-10-19 23:05     ` Jason Gunthorpe
2020-10-20 14:09       ` Tom Rix
2020-10-20  8:47     ` [Ocfs2-devel] " John Haxby
2020-10-20 13:55     ` Tom Rix
2020-10-20 18:42     ` Joe Perches
2020-10-20 18:51       ` Nick Desaulniers
2020-10-20 18:54         ` Joe Perches
2020-10-18  9:29 ` Hans de Goede
2020-10-18 18:59 ` [Ocfs2-devel] " Matthew Wilcox
2020-10-18 19:06   ` Joe Perches
2020-10-18 19:13   ` James Bottomley
2020-10-18 19:16     ` Matthew Wilcox
2020-10-18 19:17       ` James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d9ea654104d55f590fb97d252d64a66b23c1a096.camel@perches.com \
    --to=joe@perches.com \
    --cc=akpm@linux-foundation.org \
    --cc=cocci@systeme.lip6.fr \
    --cc=julia.lawall@inria.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=trix@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).