From: Leon Romanovsky <leon@kernel.org>
To: Joe Perches <joe@perches.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Saeed Mahameed <saeedm@mellanox.com>,
netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org
Subject: Re: [PATCH -next 003/491] MELLANOX MLX5 core VPI driver: Use fallthrough;
Date: Wed, 11 Mar 2020 09:00:08 +0200 [thread overview]
Message-ID: <20200311070008.GE4215@unreal> (raw)
In-Reply-To: <3ce4519315294b9738abe6a78e2737f49af9a653.1583896347.git.joe@perches.com>
On Tue, Mar 10, 2020 at 09:51:17PM -0700, Joe Perches wrote:
> Convert the various uses of fallthrough comments to fallthrough;
>
> Done via script
> Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe.com/
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 ++--
> drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +-
> .../net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 8 ++++----
> drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 +-
> 6 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
> index a226277..2a1cc2 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
> @@ -223,7 +223,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;
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
> index f049e0a..f74e50 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
> @@ -167,11 +167,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;
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> index 01539b8..8a3376a 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> @@ -225,7 +225,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;
This should be removed, there is return before.
> default:
> return -EOPNOTSUPP;
> }
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> index 4b5b661..033454 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> @@ -2426,7 +2426,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)
> return 0;
> - /* fall through */
> + fallthrough;
> case MLX5_CAP_INLINE_MODE_L2:
> NL_SET_ERR_MSG_MOD(extack, "Inline mode can't be set");
> return -EOPNOTSUPP;
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
> index 416676..a40e43 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
> @@ -199,13 +199,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,
> @@ -256,7 +256,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);
> @@ -279,7 +279,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);
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
> index 1faac31f..aea1065 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
> @@ -125,7 +125,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;
> --
> 2.24.0
>
next prev parent reply other threads:[~2020-03-11 7:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1583896344.git.joe@perches.com>
2020-03-11 4:51 ` [PATCH -next 003/491] MELLANOX MLX5 core VPI driver: Use fallthrough; Joe Perches
2020-03-11 7:00 ` Leon Romanovsky [this message]
2020-03-11 4:51 ` [PATCH -next 029/491] BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER: " Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200311070008.GE4215@unreal \
--to=leon@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=joe@perches.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).