From patchwork Mon Oct 19 17:26:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 298801 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=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 441EFC433DF for ; Mon, 19 Oct 2020 17:26:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D375122282 for ; Mon, 19 Oct 2020 17:26:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Rsh5xzuH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730791AbgJSR0W (ORCPT ); Mon, 19 Oct 2020 13:26:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59377 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725952AbgJSR0U (ORCPT ); Mon, 19 Oct 2020 13:26:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603128380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=aVNN1C4LAhUWrEh6nN2bC8yXuvzsPM7VbyNnh38X8Js=; b=Rsh5xzuHY+r/MRriW12Ox5sRMMMVO7bhd6kzfAA8niqjIASxsmd9iOfegJtW1tRTeGM2QA STF4N1xL75QwORjgFtHD9p8/RiSBuShhFkHtTOEloUIWr3qx4vXK2sKFz1XNZZfzSsYM4G M+bQpJfkzLKfEGf9vF32HWu5lCpFYWw= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-79-4oDZjNM8P22EoaJmcVjXHg-1; Mon, 19 Oct 2020 13:26:14 -0400 X-MC-Unique: 4oDZjNM8P22EoaJmcVjXHg-1 Received: by mail-qt1-f200.google.com with SMTP id z12so417472qto.4 for ; Mon, 19 Oct 2020 10:26:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aVNN1C4LAhUWrEh6nN2bC8yXuvzsPM7VbyNnh38X8Js=; b=im06KES5yrmbEJ9EuMCBjx/q3sM2cmtd5vT03rySwOUngV/aFvZa17tf2kVRg82/Vu y6EhzDj4jdnhT4byctiAWOhQV3K0/N3eMz/NPfU6exIR6ppZ7XUFI/gPuQydDBr5e3Lx 4sqEYBBDUXqspv5gCugNurgHhBuM0Kh1IsfcVJdwYrsCLyCqab+eTfaskiPDvb5irzBa Dq4jfoyAd5+9vv5bNvE9AsM1pCQfUFPNpYTBqsJlXARXklWWiaX4UgCKQ79AeBQScpck 5WybVKp31xBB7+mUFia2C2p4npYtZxNvkkXu/WCaFyAKP1X6l1OHpsio/8NkeXSmraJC S5qQ== X-Gm-Message-State: AOAM530U32HORkl9G31h1JWnZBKcxCS1ecAmCHBm+EKyHgtsZMWGrcPr SRJ18qnnVFFyL66Gz6PNkzYodiwOhwF10hKAflcQFrRMTIxsJYrAZhUpXBT5YMCsMizvOmWFRXh +Q9wYQn6qohyqF7VS X-Received: by 2002:a37:a251:: with SMTP id l78mr562665qke.291.1603128373875; Mon, 19 Oct 2020 10:26:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJsKJNW3l1vaCdXKu71mlHfkWuJrWdzvbnm3fDmbdSsQlxEmc6RtS4ldJcTGmPfXxmIylQKw== X-Received: by 2002:a37:a251:: with SMTP id l78mr562637qke.291.1603128373609; Mon, 19 Oct 2020 10:26:13 -0700 (PDT) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id a21sm228385qtb.30.2020.10.19.10.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 10:26:12 -0700 (PDT) From: trix@redhat.com To: irusskikh@marvell.com, davem@davemloft.net, kuba@kernel.org, benve@cisco.com, _govind@gmx.com, jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, bigeasy@linutronix.de, tglx@linutronix.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, Tom Rix Subject: [PATCH] net: remove unneeded break Date: Mon, 19 Oct 2020 10:26:07 -0700 Message-Id: <20201019172607.31622-1-trix@redhat.com> X-Mailer: git-send-email 2.18.1 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tom Rix A break is not needed if it is preceded by a return or goto Signed-off-by: Tom Rix --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 1 - drivers/net/ethernet/cisco/enic/enic_ethtool.c | 1 - drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 - drivers/net/wan/lmc/lmc_proto.c | 4 ---- 4 files changed, 7 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 0f865daeb36d..bf5e0e9bd0e2 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -1163,7 +1163,6 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, default: err = -1; goto err_exit; - break; } if (!(self->aq_nic_cfg.aq_hw_caps->link_speed_msk & rate)) { err = -1; diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c index a4dd52bba2c3..1a9803f2073e 100644 --- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c +++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c @@ -434,7 +434,6 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd) break; default: return -EINVAL; - break; } fsp->h_u.tcp_ip4_spec.ip4src = flow_get_u32_src(&n->keys); diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c index de563cfd294d..4b93ba149ec5 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c @@ -350,7 +350,6 @@ static s32 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw) if (ixgbe_read_eerd_generic(hw, pointer, &length)) { hw_dbg(hw, "EEPROM read failed\n"); return IXGBE_ERR_EEPROM; - break; } /* Skip pointer section if length is invalid. */ diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c index e8b0b902b424..4e9cc83b615a 100644 --- a/drivers/net/wan/lmc/lmc_proto.c +++ b/drivers/net/wan/lmc/lmc_proto.c @@ -89,17 +89,13 @@ __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ switch(sc->if_type){ case LMC_PPP: return hdlc_type_trans(skb, sc->lmc_device); - break; case LMC_NET: return htons(ETH_P_802_2); - break; case LMC_RAW: /* Packet type for skbuff kind of useless */ return htons(ETH_P_802_2); - break; default: printk(KERN_WARNING "%s: No protocol set for this interface, assuming 802.2 (which is wrong!!)\n", sc->name); return htons(ETH_P_802_2); - break; } }