Skip to content

Commit 22f9d2f

Browse files
JuliaLawallSaeed Mahameed
authored andcommitted
net/mlx5: drop unnecessary list_empty
list_for_each_entry is able to handle an empty list. The only effect of avoiding the loop is not initializing the index variable. Drop list_empty tests in cases where these variables are not used. Note that list_for_each_entry is defined in terms of list_first_entry, which indicates that it should not be used on an empty list. But in list_for_each_entry, the element obtained by list_first_entry is not really accessed, only the address of its list_head field is compared to the address of the list head, so the list_first_entry is safe. The semantic patch that makes this change is as follows (with another variant for the no brace case): (http://coccinelle.lip6.fr/) <smpl> @@ expression x,e; iterator name list_for_each_entry; statement S; identifier i; @@ -if (!(list_empty(x))) { list_for_each_entry(i,x,...) S - } ... when != i ? i = e </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent c8b838d commit 22f9d2f

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -474,14 +474,13 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher)
474474
int ret;
475475

476476
next_matcher = NULL;
477-
if (!list_empty(&tbl->matcher_list))
478-
list_for_each_entry(tmp_matcher, &tbl->matcher_list, matcher_list) {
479-
if (tmp_matcher->prio >= matcher->prio) {
480-
next_matcher = tmp_matcher;
481-
break;
482-
}
483-
first = false;
477+
list_for_each_entry(tmp_matcher, &tbl->matcher_list, matcher_list) {
478+
if (tmp_matcher->prio >= matcher->prio) {
479+
next_matcher = tmp_matcher;
480+
break;
484481
}
482+
first = false;
483+
}
485484

486485
prev_matcher = NULL;
487486
if (next_matcher && !first)

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,8 @@ void mlx5dr_rule_update_rule_member(struct mlx5dr_ste *ste,
574574
{
575575
struct mlx5dr_rule_member *rule_mem;
576576

577-
if (!list_empty(&ste->rule_list))
578-
list_for_each_entry(rule_mem, &ste->rule_list, use_ste_list)
579-
rule_mem->ste = new_ste;
577+
list_for_each_entry(rule_mem, &ste->rule_list, use_ste_list)
578+
rule_mem->ste = new_ste;
580579
}
581580

582581
static void dr_rule_clean_rule_members(struct mlx5dr_rule *rule,

0 commit comments

Comments
 (0)