]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net/mlx5: Use fallthrough pseudo-keyword
authorGustavo A. R. Silva <gustavoars@kernel.org>
Mon, 27 Jul 2020 18:03:56 +0000 (13:03 -0500)
committerSaeed Mahameed <saeedm@mellanox.com>
Tue, 28 Jul 2020 09:37:55 +0000 (02:37 -0700)
Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
drivers/net/ethernet/mellanox/mlx5/core/vport.c

index f7fd2ed322792efe1970af32adcf8de905221390..9334c9c3e208b16bbbc8b527a8268ae5fc0553a3 100644 (file)
@@ -388,7 +388,7 @@ mlx5e_set_eseg_swp(struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg,
        switch (swp_spec->tun_l4_proto) {
        case IPPROTO_UDP:
                eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L4_UDP;
-               /* fall through */
+               fallthrough;
        case IPPROTO_TCP:
                eseg->swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;
                break;
index 90db221e31df365b70de3e99bb35e7cabbec770b..0e6946fc121f0793234b057896de37b988429ac8 100644 (file)
@@ -152,11 +152,11 @@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di,
                return true;
        default:
                bpf_warn_invalid_xdp_action(act);
-               /* fall through */
+               fallthrough;
        case XDP_ABORTED:
 xdp_abort:
                trace_xdp_exception(rq->netdev, prog, act);
-               /* fall through */
+               fallthrough;
        case XDP_DROP:
                rq->stats->xdp_drop++;
                return true;
index 0e6698d1b4ca9fb532f52988c0da5017875a84ad..f4861545b236b58ca103ba2cb0f41ad1d3335821 100644 (file)
@@ -470,7 +470,7 @@ bool mlx5e_ktls_handle_tx_skb(struct tls_context *tls_ctx, struct mlx5e_txqsq *s
                        if (likely(!skb->decrypted))
                                goto out;
                        WARN_ON_ONCE(1);
-                       /* fall-through */
+                       fallthrough;
                case MLX5E_KTLS_SYNC_FAIL:
                        goto err_out;
                }
index af849bc83c3063899fd89e7223ad9a72bdeb4004..08270987c506623f6081184e2e908649323403df 100644 (file)
@@ -243,7 +243,7 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)
                return MLX5E_NUM_PFLAGS;
        case ETH_SS_TEST:
                return mlx5e_self_test_num(priv);
-       /* fallthrough */
+               fallthrough;
        default:
                return -EOPNOTSUPP;
        }
index 54de53daf1c029dc450eecf1e001be4792abcc7c..be610d40749a69bda0625f128aa697a3b2a5b994 100644 (file)
@@ -2346,7 +2346,7 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode,
        case MLX5_CAP_INLINE_MODE_NOT_REQUIRED:
                if (mode == DEVLINK_ESWITCH_INLINE_MODE_NONE)
                        goto out;
-               /* fall through */
+               fallthrough;
        case MLX5_CAP_INLINE_MODE_L2:
                NL_SET_ERR_MSG_MOD(extack, "Inline mode can't be set");
                err = -EOPNOTSUPP;
index 182d3ac3e73f278d86b34a6bf2507e4025888e45..831d2c39e153421503c2a863737016d18e5004cb 100644 (file)
@@ -339,14 +339,14 @@ static void mlx5_fpga_conn_handle_cqe(struct mlx5_fpga_conn *conn,
        switch (opcode) {
        case MLX5_CQE_REQ_ERR:
                status = ((struct mlx5_err_cqe *)cqe)->syndrome;
-               /* Fall through */
+               fallthrough;
        case MLX5_CQE_REQ:
                mlx5_fpga_conn_sq_cqe(conn, cqe, status);
                break;
 
        case MLX5_CQE_RESP_ERR:
                status = ((struct mlx5_err_cqe *)cqe)->syndrome;
-               /* Fall through */
+               fallthrough;
        case MLX5_CQE_RESP_SEND:
                mlx5_fpga_conn_rq_cqe(conn, cqe, status);
                break;
index e9089a793632b229b068bd3330c2348f27e49eb9..9e68f5926ab6ed94c96c72e61b529c0a4c423440 100644 (file)
@@ -198,13 +198,13 @@ static void mlx5_lag_fib_update(struct work_struct *work)
        /* Protect internal structures from changes */
        rtnl_lock();
        switch (fib_work->event) {
-       case FIB_EVENT_ENTRY_REPLACE: /* fall through */
+       case FIB_EVENT_ENTRY_REPLACE:
        case FIB_EVENT_ENTRY_DEL:
                mlx5_lag_fib_route_event(ldev, fib_work->event,
                                         fib_work->fen_info.fi);
                fib_info_put(fib_work->fen_info.fi);
                break;
-       case FIB_EVENT_NH_ADD: /* fall through */
+       case FIB_EVENT_NH_ADD:
        case FIB_EVENT_NH_DEL:
                fib_nh = fib_work->fnh_info.fib_nh;
                mlx5_lag_fib_nexthop_event(ldev,
@@ -255,7 +255,7 @@ static int mlx5_lag_fib_event(struct notifier_block *nb,
                return NOTIFY_DONE;
 
        switch (event) {
-       case FIB_EVENT_ENTRY_REPLACE: /* fall through */
+       case FIB_EVENT_ENTRY_REPLACE:
        case FIB_EVENT_ENTRY_DEL:
                fen_info = container_of(info, struct fib_entry_notifier_info,
                                        info);
@@ -278,7 +278,7 @@ static int mlx5_lag_fib_event(struct notifier_block *nb,
                 */
                fib_info_hold(fib_work->fen_info.fi);
                break;
-       case FIB_EVENT_NH_ADD: /* fall through */
+       case FIB_EVENT_NH_ADD:
        case FIB_EVENT_NH_DEL:
                fnh_info = container_of(info, struct fib_nh_notifier_info,
                                        info);
index 88cdb9bb4c4a43a6bb918263250897884246ba55..bdafc85fd874db5c3855b92ffc3f1978bc374f75 100644 (file)
@@ -110,7 +110,7 @@ void mlx5_query_min_inline(struct mlx5_core_dev *mdev,
        case MLX5_CAP_INLINE_MODE_VPORT_CONTEXT:
                if (!mlx5_query_nic_vport_min_inline(mdev, 0, min_inline_mode))
                        break;
-               /* fall through */
+               fallthrough;
        case MLX5_CAP_INLINE_MODE_L2:
                *min_inline_mode = MLX5_INLINE_MODE_L2;
                break;