mlxsw: spectrum_router: simplify list unwinding

The setting of i here
err_nexthop6_group_get:
	i = nrt6;
Is redundant, i is already nrt6.  So remove
this statement.

The for loop for the unwinding
err_rt6_create:
	for (i--; i >= 0; i--) {
Is equivelent to
	for (; i > 0; i--) {

Two consecutive labels can be reduced to one.

Signed-off-by: Tom Rix <trix@redhat.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/20220402121516.2750284-1-trix@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 79deb19e3a1943183d8ed7a7ab6df6e48460894c..79fd486e29e389a479f7f0615ef3a9149ec65da3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -7010,7 +7010,7 @@ mlxsw_sp_fib6_entry_nexthop_add(struct mlxsw_sp *mlxsw_sp,
                mlxsw_sp_rt6 = mlxsw_sp_rt6_create(rt_arr[i]);
                if (IS_ERR(mlxsw_sp_rt6)) {
                        err = PTR_ERR(mlxsw_sp_rt6);
-                       goto err_rt6_create;
+                       goto err_rt6_unwind;
                }
 
                list_add_tail(&mlxsw_sp_rt6->list, &fib6_entry->rt6_list);
@@ -7019,14 +7019,12 @@ mlxsw_sp_fib6_entry_nexthop_add(struct mlxsw_sp *mlxsw_sp,
 
        err = mlxsw_sp_nexthop6_group_update(mlxsw_sp, op_ctx, fib6_entry);
        if (err)
-               goto err_nexthop6_group_update;
+               goto err_rt6_unwind;
 
        return 0;
 
-err_nexthop6_group_update:
-       i = nrt6;
-err_rt6_create:
-       for (i--; i >= 0; i--) {
+err_rt6_unwind:
+       for (; i > 0; i--) {
                fib6_entry->nrt6--;
                mlxsw_sp_rt6 = list_last_entry(&fib6_entry->rt6_list,
                                               struct mlxsw_sp_rt6, list);
@@ -7154,7 +7152,7 @@ mlxsw_sp_fib6_entry_create(struct mlxsw_sp *mlxsw_sp,
                mlxsw_sp_rt6 = mlxsw_sp_rt6_create(rt_arr[i]);
                if (IS_ERR(mlxsw_sp_rt6)) {
                        err = PTR_ERR(mlxsw_sp_rt6);
-                       goto err_rt6_create;
+                       goto err_rt6_unwind;
                }
                list_add_tail(&mlxsw_sp_rt6->list, &fib6_entry->rt6_list);
                fib6_entry->nrt6++;
@@ -7162,7 +7160,7 @@ mlxsw_sp_fib6_entry_create(struct mlxsw_sp *mlxsw_sp,
 
        err = mlxsw_sp_nexthop6_group_get(mlxsw_sp, fib6_entry);
        if (err)
-               goto err_nexthop6_group_get;
+               goto err_rt6_unwind;
 
        err = mlxsw_sp_nexthop_group_vr_link(fib_entry->nh_group,
                                             fib_node->fib);
@@ -7181,10 +7179,8 @@ err_fib6_entry_type_set:
        mlxsw_sp_nexthop_group_vr_unlink(fib_entry->nh_group, fib_node->fib);
 err_nexthop_group_vr_link:
        mlxsw_sp_nexthop6_group_put(mlxsw_sp, fib_entry);
-err_nexthop6_group_get:
-       i = nrt6;
-err_rt6_create:
-       for (i--; i >= 0; i--) {
+err_rt6_unwind:
+       for (; i > 0; i--) {
                fib6_entry->nrt6--;
                mlxsw_sp_rt6 = list_last_entry(&fib6_entry->rt6_list,
                                               struct mlxsw_sp_rt6, list);