Skip to content

Commit a3f6964

Browse files
cjubrankuba-moo
authored andcommitted
net/mlx5e: Remove unused mdev param from RSS indir init
The mdev parameter is not used in mlx5e_rss_params_indir_init, so drop it from the function and update all callers accordingly. No functional changes. Signed-off-by: Carolina Jubran <[email protected]> Signed-off-by: Tariq Toukan <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 33dbaa5 commit a3f6964

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en/rss.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_ch
9191
rss->indir.actual_table_size = mlx5e_rqt_size(rss->mdev, num_channels);
9292
}
9393

94-
int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir, struct mlx5_core_dev *mdev,
94+
int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir,
9595
u32 actual_table_size, u32 max_table_size)
9696
{
9797
indir->table = kvmalloc_array(max_table_size, sizeof(*indir->table), GFP_KERNEL);
@@ -139,7 +139,8 @@ static struct mlx5e_rss *mlx5e_rss_init_copy(const struct mlx5e_rss *from)
139139
if (!rss)
140140
return ERR_PTR(-ENOMEM);
141141

142-
err = mlx5e_rss_params_indir_init(&rss->indir, from->mdev, from->indir.actual_table_size,
142+
err = mlx5e_rss_params_indir_init(&rss->indir,
143+
from->indir.actual_table_size,
143144
from->indir.max_table_size);
144145
if (err)
145146
goto err_free_rss;
@@ -363,16 +364,17 @@ struct mlx5e_rss *mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_suppo
363364
enum mlx5e_rss_init_type type, unsigned int nch,
364365
unsigned int max_nch)
365366
{
367+
u32 rqt_max_size, rqt_size;
366368
struct mlx5e_rss *rss;
367369
int err;
368370

369371
rss = kvzalloc(sizeof(*rss), GFP_KERNEL);
370372
if (!rss)
371373
return ERR_PTR(-ENOMEM);
372374

373-
err = mlx5e_rss_params_indir_init(&rss->indir, mdev,
374-
mlx5e_rqt_size(mdev, nch),
375-
mlx5e_rqt_size(mdev, max_nch));
375+
rqt_size = mlx5e_rqt_size(mdev, nch);
376+
rqt_max_size = mlx5e_rqt_size(mdev, max_nch);
377+
err = mlx5e_rss_params_indir_init(&rss->indir, rqt_size, rqt_max_size);
376378
if (err)
377379
goto err_free_rss;
378380

drivers/net/ethernet/mellanox/mlx5/core/en/rss.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mlx5e_rss_get_default_tt_config(enum mlx5_traffic_types tt);
1818

1919
struct mlx5e_rss;
2020

21-
int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir, struct mlx5_core_dev *mdev,
21+
int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir,
2222
u32 actual_table_size, u32 max_table_size);
2323
void mlx5e_rss_params_indir_cleanup(struct mlx5e_rss_params_indir *indir);
2424
void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_channels);

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,11 +758,11 @@ static int mlx5e_hairpin_create_indirect_rqt(struct mlx5e_hairpin *hp)
758758
struct mlx5e_priv *priv = hp->func_priv;
759759
struct mlx5_core_dev *mdev = priv->mdev;
760760
struct mlx5e_rss_params_indir indir;
761+
u32 rqt_size;
761762
int err;
762763

763-
err = mlx5e_rss_params_indir_init(&indir, mdev,
764-
mlx5e_rqt_size(mdev, hp->num_channels),
765-
mlx5e_rqt_size(mdev, hp->num_channels));
764+
rqt_size = mlx5e_rqt_size(mdev, hp->num_channels);
765+
err = mlx5e_rss_params_indir_init(&indir, rqt_size, rqt_size);
766766
if (err)
767767
return err;
768768

0 commit comments

Comments
 (0)