From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 42521A00C5; Mon, 6 Jul 2020 10:24:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 772911D8E0; Mon, 6 Jul 2020 10:24:01 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 885D51D8DA for ; Mon, 6 Jul 2020 10:23:59 +0200 (CEST) IronPort-SDR: 4aOvz8v95ia5b4mRPaMjkbEaHFvctmOcACf/jBzLI4JWhCBBqC9qZ/ibkDo7BBJf7IIVl0XLRl UYJsg6KYfcCw== X-IronPort-AV: E=McAfee;i="6000,8403,9673"; a="147379271" X-IronPort-AV: E=Sophos;i="5.75,318,1589266800"; d="scan'208";a="147379271" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2020 01:23:59 -0700 IronPort-SDR: DBKfQvKhVcQAJjA+2O0c97s0TW54+dWPAOhTeTuCcYbeIktcYGmRHQPl9o3mpoTHRTACwmKxKM 5iGWQMyNN0FA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,318,1589266800"; d="scan'208";a="388128842" Received: from intel.sh.intel.com ([10.239.255.48]) by fmsmga001.fm.intel.com with ESMTP; 06 Jul 2020 01:23:56 -0700 From: Guinan Sun To: dev@dpdk.org Cc: Jeff Guo , Zhao1 Wei , Guinan Sun , Jeff Kirsher , Todd Fujinaka Date: Mon, 6 Jul 2020 08:12:01 +0000 Message-Id: <20200706081222.19279-7-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200706081222.19279-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> <20200706081222.19279-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH v3 06/27] net/e1000/base: fall through explicitly X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Found some inconsistent code comments when it came to when we "fall through", so made them more consistent and non-repetitive. This patch adds/changes fall through comments to address new warnings produced by gcc 7. Signed-off-by: Jeff Kirsher Signed-off-by: Todd Fujinaka Signed-off-by: Guinan Sun --- drivers/net/e1000/base/e1000_82575.c | 11 +++++++++-- drivers/net/e1000/base/e1000_mbx.c | 1 + drivers/net/e1000/base/e1000_phy.c | 1 + drivers/net/e1000/base/e1000_vf.c | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c index 8db287251..7c562258a 100644 --- a/drivers/net/e1000/base/e1000_82575.c +++ b/drivers/net/e1000/base/e1000_82575.c @@ -1560,14 +1560,21 @@ STATIC s32 e1000_setup_copper_link_82575(struct e1000_hw *hw) } switch (hw->phy.type) { case e1000_phy_i210: + /* Fall through */ case e1000_phy_m88: switch (hw->phy.id) { case I347AT4_E_PHY_ID: + /* Fall through */ case M88E1112_E_PHY_ID: + /* Fall through */ case M88E1340M_E_PHY_ID: + /* Fall through */ case M88E1543_E_PHY_ID: + /* Fall through */ case M88E1512_E_PHY_ID: + /* Fall through */ case I210_I_PHY_ID: + /* Fall through */ ret_val = e1000_copper_link_setup_m88_gen2(hw); break; default: @@ -1653,7 +1660,7 @@ STATIC s32 e1000_setup_serdes_link_82575(struct e1000_hw *hw) case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX: /* disable PCS autoneg and support parallel detect only */ pcs_autoneg = false; - /* fall through to default case */ + /* Fall through */ default: if (hw->mac.type == e1000_82575 || hw->mac.type == e1000_82576) { @@ -1779,7 +1786,7 @@ STATIC s32 e1000_get_media_type_82575(struct e1000_hw *hw) dev_spec->sgmii_active = true; break; } - /* fall through for I2C based SGMII */ + /* Fall through for I2C based SGMII */ case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES: /* read media type from SFP EEPROM */ ret_val = e1000_set_sfp_media_type_82575(hw); diff --git a/drivers/net/e1000/base/e1000_mbx.c b/drivers/net/e1000/base/e1000_mbx.c index 6fae6767f..4cac3642e 100644 --- a/drivers/net/e1000/base/e1000_mbx.c +++ b/drivers/net/e1000/base/e1000_mbx.c @@ -755,6 +755,7 @@ s32 e1000_init_mbx_params_pf(struct e1000_hw *hw) mbx->stats.reqs = 0; mbx->stats.acks = 0; mbx->stats.rsts = 0; + /* Fall through */ default: return E1000_SUCCESS; } diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c index e8d922147..be4786794 100644 --- a/drivers/net/e1000/base/e1000_phy.c +++ b/drivers/net/e1000/base/e1000_phy.c @@ -1274,6 +1274,7 @@ s32 e1000_copper_link_setup_m88_gen2(struct e1000_hw *hw) phy_data |= M88E1000_PSCR_AUTO_X_1000T; break; } + /* Fall through */ case 0: default: phy_data |= M88E1000_PSCR_AUTO_X_MODE; diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c index 543fa7741..dc109d5e0 100644 --- a/drivers/net/e1000/base/e1000_vf.c +++ b/drivers/net/e1000/base/e1000_vf.c @@ -462,8 +462,10 @@ s32 e1000_promisc_set_vf(struct e1000_hw *hw, enum e1000_promisc_type type) break; case e1000_promisc_enabled: msgbuf |= E1000_VF_SET_PROMISC_MULTICAST; + /* fall-through */ case e1000_promisc_unicast: msgbuf |= E1000_VF_SET_PROMISC_UNICAST; + /* fall-through */ case e1000_promisc_disabled: break; default: -- 2.17.1