From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B3FBC433DF for ; Mon, 19 Oct 2020 15:21:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34F262231B for ; Mon, 19 Oct 2020 15:21:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730059AbgJSPVS (ORCPT ); Mon, 19 Oct 2020 11:21:18 -0400 Received: from smtprelay0120.hostedemail.com ([216.40.44.120]:44846 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729538AbgJSPVR (ORCPT ); Mon, 19 Oct 2020 11:21:17 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id 4E940837F27E; Mon, 19 Oct 2020 15:21:16 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: maid96_3f0c95a27238 X-Filterd-Recvd-Size: 2972 Received: from XPS-9350.home (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf14.hostedemail.com (Postfix) with ESMTPA; Mon, 19 Oct 2020 15:21:11 +0000 (UTC) Message-ID: <859112e91c3d221dc599e381dbaecb90dd6467a1.camel@perches.com> Subject: Re: [PATCH] wireless: remove unneeded break From: Joe Perches To: Christian Lamparter , trix@redhat.com, kvalo@codeaurora.org, davem@davemloft.net, kuba@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, ath9k-devel@qca.qualcomm.com, johannes.berg@intel.com, emmanuel.grumbach@intel.com, luciano.coelho@intel.com, linuxwifi@intel.com, chunkeey@googlemail.com, pkshih@realtek.com, sara.sharon@intel.com, tova.mussai@intel.com, nathan.errera@intel.com, lior2.cohen@intel.com, john@phrozen.org, shaul.triebitz@intel.com, shahar.s.matityahu@intel.com, Larry.Finger@lwfinger.net, zhengbin13@huawei.com, christophe.jaillet@wanadoo.fr, yanaijie@huawei.com, saurav.girepunje@gmail.com Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Date: Mon, 19 Oct 2020 08:21:10 -0700 In-Reply-To: References: <20201019150507.20574-1-trix@redhat.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.36.4-0ubuntu1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2020-10-19 at 17:14 +0200, Christian Lamparter wrote: > On 19/10/2020 17:05, trix@redhat.com wrote: > > From: Tom Rix > > > > A break is not needed if it is preceded by a return or goto > > > > Signed-off-by: Tom Rix > > diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c > > index 5bd35c147e19..3ca9d26df174 100644 > > --- a/drivers/net/wireless/intersil/p54/eeprom.c > > +++ b/drivers/net/wireless/intersil/p54/eeprom.c > > @@ -870,7 +870,6 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) > > } else { > > goto good_eeprom; > > } > > - break; > Won't the compiler (gcc) now complain about a missing fallthrough annotation? > > default: > > break; > > } No, though the code would be clearer like: --- diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c index 5bd35c147e19..233fa072d96d 100644 --- a/drivers/net/wireless/intersil/p54/eeprom.c +++ b/drivers/net/wireless/intersil/p54/eeprom.c @@ -867,10 +867,8 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) "test!\n"); err = -ENOMSG; goto err; - } else { - goto good_eeprom; } - break; + goto good_eeprom; default: break; }