From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julia Lawall Subject: Re: [PATCH net-next] net: remove unnecessary return's Date: Thu, 13 Feb 2014 23:28:27 +0100 (CET) Message-ID: References: <20140212205122.5783660e@nehalam.linuxnetplumber.net> <1392273125.2214.25.camel@joe-AO722> <20140213220021.GA1174@redhat.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Julia Lawall , Joe Perches , Stephen Hemminger , David Miller , netdev@vger.kernel.org To: Dave Jones Return-path: Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:40144 "EHLO mail2-relais-roc.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752482AbaBMW2a (ORCPT ); Thu, 13 Feb 2014 17:28:30 -0500 In-Reply-To: <20140213220021.GA1174@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, 13 Feb 2014, Dave Jones wrote: > On Thu, Feb 13, 2014 at 10:55:23PM +0100, Julia Lawall wrote: > > > The patch below converts label: return; } to label: ; }. I have only > > scanned through the patches, not patched the code and looked at the > > results, so I am not sure that it is completely correct. On the other > > hand, I'm also not sure that label: ; } is better than label: return; }, > > either. If people think it is, then I can cheack the results in more > > detail. > > Why not delete the label, and just replace the goto with a return if > the label is at the end of the function ? Here is an example. Perhaps the uniformity of the if ... goto pattern is valuable, though? julia diff -u -p a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c @@ -586,7 +586,7 @@ static void ab3100_setup_debugfs(struct ab3100_dir = debugfs_create_dir("ab3100", NULL); if (!ab3100_dir) - goto exit_no_debugfs; + return; ab3100_reg_file = debugfs_create_file("registers", S_IRUGO, ab3100_dir, ab3100, @@ -623,7 +623,6 @@ static void ab3100_setup_debugfs(struct debugfs_remove(ab3100_reg_file); exit_destroy_dir: debugfs_remove(ab3100_dir); - exit_no_debugfs: return; } static inline void ab3100_remove_debugfs(void)