From 3f4c38df5b0f51823df48851a56fd489f0e97545 Mon Sep 17 00:00:00 2001 From: Yevgeny Kliteynik Date: Wed, 11 Sep 2024 13:17:44 -0700 Subject: [PATCH] net/mlx5: HWS, fixed error flow return values of some functions Fixed all the '-ret' returns in error flow of functions to 'ret', as the internal functions are already returning negative error values (e.g. -EINVAL) Signed-off-by: Yevgeny Kliteynik Signed-off-by: Saeed Mahameed Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20240911201757.1505453-3-saeed@kernel.org Signed-off-by: Jakub Kicinski --- .../mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c | 2 +- .../mellanox/mlx5/core/steering/hws/mlx5hws_rule.c | 8 ++++---- .../mellanox/mlx5/core/steering/hws/mlx5hws_table.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c index 1964261415aa..33d2b31e4b46 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_matcher.c @@ -967,7 +967,7 @@ int mlx5hws_matcher_attach_at(struct mlx5hws_matcher *matcher, ret = hws_matcher_check_and_process_at(matcher, at); if (ret) - return -ret; + return ret; required_stes = at->num_of_action_stes - (!is_jumbo || at->only_term); if (matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].max_stes < required_stes) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_rule.c index c79ee70edf03..8a011b958b43 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_rule.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_rule.c @@ -751,11 +751,11 @@ int mlx5hws_rule_destroy(struct mlx5hws_rule *rule, ret = hws_rule_enqueue_precheck(rule, attr); if (unlikely(ret)) - return -ret; + return ret; ret = hws_rule_destroy_hws(rule, attr); - return -ret; + return ret; } int mlx5hws_rule_action_update(struct mlx5hws_rule *rule, @@ -767,7 +767,7 @@ int mlx5hws_rule_action_update(struct mlx5hws_rule *rule, ret = hws_rule_enqueue_precheck_update(rule, attr); if (unlikely(ret)) - return -ret; + return ret; ret = hws_rule_create_hws(rule, attr, @@ -776,5 +776,5 @@ int mlx5hws_rule_action_update(struct mlx5hws_rule *rule, at_idx, rule_actions); - return -ret; + return ret; } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_table.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_table.c index 9dbc3e9da5ea..8c063a8d87d7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_table.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws_table.c @@ -489,5 +489,5 @@ int mlx5hws_table_set_default_miss(struct mlx5hws_table *tbl, return 0; out: mutex_unlock(&ctx->ctrl_lock); - return -ret; + return ret; } -- 2.25.1