mlxsw: spectrum_acl: Rename variables in mlxsw_sp_acl_tcam_ventry_migrate()
authorJiri Pirko <jiri@mellanox.com>
Thu, 28 Feb 2019 06:59:22 +0000 (06:59 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Mar 2019 05:44:11 +0000 (21:44 -0800)
Remove some of variables in function mlxsw_sp_acl_tcam_ventry_migrate()
so the names are aligned with the rest of the code.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c

index 6a50266b6809f9d28431395ccadc04a4e5ffd9a9..0bc04016c6d057c76f1c51135a51e11d6e124f5c 100644 (file)
@@ -1175,19 +1175,19 @@ mlxsw_sp_acl_tcam_ventry_activity_get(struct mlxsw_sp *mlxsw_sp,
 static int
 mlxsw_sp_acl_tcam_ventry_migrate(struct mlxsw_sp *mlxsw_sp,
                                 struct mlxsw_sp_acl_tcam_ventry *ventry,
-                                struct mlxsw_sp_acl_tcam_chunk *chunk2)
+                                struct mlxsw_sp_acl_tcam_chunk *chunk)
 {
-       struct mlxsw_sp_acl_tcam_entry *entry2;
+       struct mlxsw_sp_acl_tcam_entry *new_entry;
 
        /* First check if the entry is not already where we want it to be. */
-       if (ventry->entry->chunk == chunk2)
+       if (ventry->entry->chunk == chunk)
                return 0;
 
-       entry2 = mlxsw_sp_acl_tcam_entry_create(mlxsw_sp, ventry, chunk2);
-       if (IS_ERR(entry2))
-               return PTR_ERR(entry2);
+       new_entry = mlxsw_sp_acl_tcam_entry_create(mlxsw_sp, ventry, chunk);
+       if (IS_ERR(new_entry))
+               return PTR_ERR(new_entry);
        mlxsw_sp_acl_tcam_entry_destroy(mlxsw_sp, ventry->entry);
-       ventry->entry = entry2;
+       ventry->entry = new_entry;
        return 0;
 }