ice: remove unnecessary fallthrough comments

Fallthrough comments are used to explicitly indicate the code is intended
to flow from one case statement to the next in a switch statement rather
than break out of the switch statement.  They are only needed when a case
has one or more statements to execute before falling through to the next
case, not when there is a list of cases for which the same statement(s)
should be executed.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
index 1c41e7e6d548b72a44eef2ccb8b5eabdcba9e747..75cc5a366b269e5cf2a1f4555d1b7dd31835cdec 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -247,7 +247,6 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)
         */
        switch (vsi->type) {
        case ICE_VSI_LB:
-               /* fall through */
        case ICE_VSI_PF:
                tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;
                break;

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index c02af503764e81a525ab7737d5d86ff5c1e947a1..583e07fffd5f6e8ebac64b607589c3fd09c7b7aa 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -1091,7 +1091,6 @@ ice_get_fecparam(struct net_device *netdev, struct ethtool_fecparam *fecparam)
                fecparam->active_fec = ETHTOOL_FEC_BASER;
                break;
        case ICE_AQ_LINK_25G_RS_528_FEC_EN:
-               /* fall through */
        case ICE_AQ_LINK_25G_RS_544_FEC_EN:
                fecparam->active_fec = ETHTOOL_FEC_RS;
                break;
@@ -1781,7 +1780,6 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,
                                                     Asym_Pause);
                break;
        case ICE_FC_PFC:
-               /* fall through */
        default:
                ethtool_link_ksettings_del_link_mode(ks, lp_advertising, Pause);
                ethtool_link_ksettings_del_link_mode(ks, lp_advertising,

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index fe7748518e417c71abf832b3c5f0736cbf972836..ff72a6d1c97891d9fa0a182db7441de624c375ff 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -121,7 +121,6 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)
 {
        switch (vsi->type) {
        case ICE_VSI_PF:
-               /* fall through */
        case ICE_VSI_LB:
                vsi->num_rx_desc = ICE_DFLT_NUM_RX_DESC;
                vsi->num_tx_desc = ICE_DFLT_NUM_TX_DESC;
@@ -817,7 +816,6 @@ static int ice_vsi_init(struct ice_vsi *vsi, bool init_vsi)
        ctxt->info = vsi->info;
        switch (vsi->type) {
        case ICE_VSI_LB:
-               /* fall through */
        case ICE_VSI_PF:
                ctxt->flags = ICE_AQ_VSI_TYPE_PF;
                break;

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 9bbe9d1fc9a807f4b1458b5589020c3c25ff290c..ce5397d182198155b9b79b933c1e3b037e162cd8 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -706,7 +706,6 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)
        /* Get FEC mode based on negotiated link info */
        switch (vsi->port_info->phy.link_info.fec_info) {
        case ICE_AQ_LINK_25G_RS_528_FEC_EN:
-               /* fall through */
        case ICE_AQ_LINK_25G_RS_544_FEC_EN:
                fec = "RS-FEC";
                break;
@@ -2955,7 +2954,6 @@ ice_log_pkg_init(struct ice_hw *hw, enum ice_status *status)
                }
                break;
        case ICE_ERR_BUF_TOO_SHORT:
-               /* fall-through */
        case ICE_ERR_CFG:
                dev_err(dev, "The DDP package file is invalid. Entering Safe Mode.\n");
                break;

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index d2db0d04e1174258b9108e92b9e939d00bd03587..554f567476f3f884ae68edb07574939fce4490b0 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -121,9 +121,7 @@ u32 ice_conv_link_speed_to_virtchnl(bool adv_link_support, u16 link_speed)
                        speed = (u32)VIRTCHNL_LINK_SPEED_25GB;
                        break;
                case ICE_AQ_LINK_SPEED_40GB:
-                       /* fall through */
                case ICE_AQ_LINK_SPEED_50GB:
-                       /* fall through */
                case ICE_AQ_LINK_SPEED_100GB:
                        speed = (u32)VIRTCHNL_LINK_SPEED_40GB;
                        break;

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 4de61dbedd36d97fac722d62374287da5651fd03..0c08ab0462df0a9c6b261ec8ebfd3dca833a4ee4 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -1188,7 +1188,6 @@ ice_adjust_itr_by_size_and_speed(struct ice_port_info *port_info,
                                    avg_pkt_size + 640);
                break;
        case ICE_AQ_LINK_SPEED_10GB:
-               /* fall through */
        default:
                itr += DIV_ROUND_UP(170 * (avg_pkt_size + 24),
                                    avg_pkt_size + 640);