| Message ID | 1563820482-10302-1-git-send-email-cai@lca.pw (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | net/mlx5: fix -Wtype-limits compilation warnings | expand |
From: Qian Cai <cai@lca.pw> Date: Mon, 22 Jul 2019 14:34:42 -0400 > The commit b9a7ba556207 ("net/mlx5: Use event mask based on device > capabilities") introduced a few compilation warnings due to it bumps > MLX5_EVENT_TYPE_MAX from 0x27 to 0x100 which is always greater than > an "struct {mlx5_eqe|mlx5_nb}.type" that is an "u8". > > drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function > 'mlx5_eq_notifier_register': > drivers/net/ethernet/mellanox/mlx5/core/eq.c:948:21: warning: comparison > is always false due to limited range of data type [-Wtype-limits] > if (nb->event_type >= MLX5_EVENT_TYPE_MAX) > ^~ > drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function > 'mlx5_eq_notifier_unregister': > drivers/net/ethernet/mellanox/mlx5/core/eq.c:959:21: warning: comparison > is always false due to limited range of data type [-Wtype-limits] > if (nb->event_type >= MLX5_EVENT_TYPE_MAX) > > Fix them by removing unnecessary checkings. > > Fixes: b9a7ba556207 ("net/mlx5: Use event mask based on device capabilities") > Signed-off-by: Qian Cai <cai@lca.pw> Saeed, I am assuming that you will take this.
On Mon, Jul 22, 2019 at 12:09 PM David Miller <davem@davemloft.net> wrote: > > From: Qian Cai <cai@lca.pw> > Date: Mon, 22 Jul 2019 14:34:42 -0400 > > > The commit b9a7ba556207 ("net/mlx5: Use event mask based on device > > capabilities") introduced a few compilation warnings due to it bumps > > MLX5_EVENT_TYPE_MAX from 0x27 to 0x100 which is always greater than > > an "struct {mlx5_eqe|mlx5_nb}.type" that is an "u8". > > > > drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function > > 'mlx5_eq_notifier_register': > > drivers/net/ethernet/mellanox/mlx5/core/eq.c:948:21: warning: comparison > > is always false due to limited range of data type [-Wtype-limits] > > if (nb->event_type >= MLX5_EVENT_TYPE_MAX) > > ^~ > > drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function > > 'mlx5_eq_notifier_unregister': > > drivers/net/ethernet/mellanox/mlx5/core/eq.c:959:21: warning: comparison > > is always false due to limited range of data type [-Wtype-limits] > > if (nb->event_type >= MLX5_EVENT_TYPE_MAX) > > > > Fix them by removing unnecessary checkings. > > > > Fixes: b9a7ba556207 ("net/mlx5: Use event mask based on device capabilities") > > Signed-off-by: Qian Cai <cai@lca.pw> > > Saeed, I am assuming that you will take this. Yes, will take it. The patch LGTM, though not applying it yet so others get the chance to review it. will apply it in a couple of days. Thanks, Saeed.
On Mon, 2019-07-22 at 14:34 -0400, Qian Cai wrote: > The commit b9a7ba556207 ("net/mlx5: Use event mask based on device > capabilities") introduced a few compilation warnings due to it bumps > MLX5_EVENT_TYPE_MAX from 0x27 to 0x100 which is always greater than > an "struct {mlx5_eqe|mlx5_nb}.type" that is an "u8". > > drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function > 'mlx5_eq_notifier_register': > drivers/net/ethernet/mellanox/mlx5/core/eq.c:948:21: warning: > comparison > is always false due to limited range of data type [-Wtype-limits] > if (nb->event_type >= MLX5_EVENT_TYPE_MAX) > ^~ > drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function > 'mlx5_eq_notifier_unregister': > drivers/net/ethernet/mellanox/mlx5/core/eq.c:959:21: warning: > comparison > is always false due to limited range of data type [-Wtype-limits] > if (nb->event_type >= MLX5_EVENT_TYPE_MAX) > > Fix them by removing unnecessary checkings. > > Fixes: b9a7ba556207 ("net/mlx5: Use event mask based on device > capabilities") > Signed-off-by: Qian Cai <cai@lca.pw> > Applied to mlx5-next. Thanks, Saeed.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c index 41f25ea2e8d9..2df9aaa421c6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c @@ -215,11 +215,7 @@ static int mlx5_eq_async_int(struct notifier_block *nb, */ dma_rmb(); - if (likely(eqe->type < MLX5_EVENT_TYPE_MAX)) - atomic_notifier_call_chain(&eqt->nh[eqe->type], eqe->type, eqe); - else - mlx5_core_warn_once(dev, "notifier_call_chain is not setup for eqe: %d\n", eqe->type); - + atomic_notifier_call_chain(&eqt->nh[eqe->type], eqe->type, eqe); atomic_notifier_call_chain(&eqt->nh[MLX5_EVENT_TYPE_NOTIFY_ANY], eqe->type, eqe); ++eq->cons_index; @@ -945,9 +941,6 @@ int mlx5_eq_notifier_register(struct mlx5_core_dev *dev, struct mlx5_nb *nb) { struct mlx5_eq_table *eqt = dev->priv.eq_table; - if (nb->event_type >= MLX5_EVENT_TYPE_MAX) - return -EINVAL; - return atomic_notifier_chain_register(&eqt->nh[nb->event_type], &nb->nb); } EXPORT_SYMBOL(mlx5_eq_notifier_register); @@ -956,9 +949,6 @@ int mlx5_eq_notifier_unregister(struct mlx5_core_dev *dev, struct mlx5_nb *nb) { struct mlx5_eq_table *eqt = dev->priv.eq_table; - if (nb->event_type >= MLX5_EVENT_TYPE_MAX) - return -EINVAL; - return atomic_notifier_chain_unregister(&eqt->nh[nb->event_type], &nb->nb); } EXPORT_SYMBOL(mlx5_eq_notifier_unregister);
The commit b9a7ba556207 ("net/mlx5: Use event mask based on device capabilities") introduced a few compilation warnings due to it bumps MLX5_EVENT_TYPE_MAX from 0x27 to 0x100 which is always greater than an "struct {mlx5_eqe|mlx5_nb}.type" that is an "u8". drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function 'mlx5_eq_notifier_register': drivers/net/ethernet/mellanox/mlx5/core/eq.c:948:21: warning: comparison is always false due to limited range of data type [-Wtype-limits] if (nb->event_type >= MLX5_EVENT_TYPE_MAX) ^~ drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function 'mlx5_eq_notifier_unregister': drivers/net/ethernet/mellanox/mlx5/core/eq.c:959:21: warning: comparison is always false due to limited range of data type [-Wtype-limits] if (nb->event_type >= MLX5_EVENT_TYPE_MAX) Fix them by removing unnecessary checkings. Fixes: b9a7ba556207 ("net/mlx5: Use event mask based on device capabilities") Signed-off-by: Qian Cai <cai@lca.pw> --- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)