Skip to content

Commit 7db22ff

Browse files
Haggai Abramonvskydavem330
Haggai Abramonvsky
authored and
davem330
committed
net/mlx5_core: Apply proper name convention to helpers
Some core helper functions were named with mlx5_ only prefix, fix that to mlx5_core_ so we're aligned with the overall scheme used for core services. Signed-off-by: Haggai Abramovsky <[email protected]> Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5e24851 commit 7db22ff

File tree

3 files changed

+36
-30
lines changed

3 files changed

+36
-30
lines changed

‎drivers/net/ethernet/mellanox/mlx5/core/en_main.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ static int mlx5e_enable_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param)
367367
mlx5_fill_page_array(&rq->wq_ctrl.buf,
368368
(__be64 *)MLX5_ADDR_OF(wq, wq, pas));
369369

370-
err = mlx5_create_rq(mdev, in, inlen, &rq->rqn);
370+
err = mlx5_core_create_rq(mdev, in, inlen, &rq->rqn);
371371

372372
kvfree(in);
373373

@@ -395,7 +395,7 @@ static int mlx5e_modify_rq(struct mlx5e_rq *rq, int curr_state, int next_state)
395395
MLX5_SET(modify_rq_in, in, rq_state, curr_state);
396396
MLX5_SET(rqc, rqc, state, next_state);
397397

398-
err = mlx5_modify_rq(mdev, rq->rqn, in, inlen);
398+
err = mlx5_core_modify_rq(mdev, rq->rqn, in, inlen);
399399

400400
kvfree(in);
401401

@@ -408,7 +408,7 @@ static void mlx5e_disable_rq(struct mlx5e_rq *rq)
408408
struct mlx5e_priv *priv = c->priv;
409409
struct mlx5_core_dev *mdev = priv->mdev;
410410

411-
mlx5_destroy_rq(mdev, rq->rqn);
411+
mlx5_core_destroy_rq(mdev, rq->rqn);
412412
}
413413

414414
static int mlx5e_wait_for_min_rx_wqes(struct mlx5e_rq *rq)
@@ -596,7 +596,7 @@ static int mlx5e_enable_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param)
596596
mlx5_fill_page_array(&sq->wq_ctrl.buf,
597597
(__be64 *)MLX5_ADDR_OF(wq, wq, pas));
598598

599-
err = mlx5_create_sq(mdev, in, inlen, &sq->sqn);
599+
err = mlx5_core_create_sq(mdev, in, inlen, &sq->sqn);
600600

601601
kvfree(in);
602602

@@ -624,7 +624,7 @@ static int mlx5e_modify_sq(struct mlx5e_sq *sq, int curr_state, int next_state)
624624
MLX5_SET(modify_sq_in, in, sq_state, curr_state);
625625
MLX5_SET(sqc, sqc, state, next_state);
626626

627-
err = mlx5_modify_sq(mdev, sq->sqn, in, inlen);
627+
err = mlx5_core_modify_sq(mdev, sq->sqn, in, inlen);
628628

629629
kvfree(in);
630630

@@ -637,7 +637,7 @@ static void mlx5e_disable_sq(struct mlx5e_sq *sq)
637637
struct mlx5e_priv *priv = c->priv;
638638
struct mlx5_core_dev *mdev = priv->mdev;
639639

640-
mlx5_destroy_sq(mdev, sq->sqn);
640+
mlx5_core_destroy_sq(mdev, sq->sqn);
641641
}
642642

643643
static int mlx5e_open_sq(struct mlx5e_channel *c,
@@ -1115,12 +1115,12 @@ static int mlx5e_open_tis(struct mlx5e_priv *priv, int tc)
11151115

11161116
MLX5_SET(tisc, tisc, prio, tc);
11171117

1118-
return mlx5_create_tis(mdev, in, sizeof(in), &priv->tisn[tc]);
1118+
return mlx5_core_create_tis(mdev, in, sizeof(in), &priv->tisn[tc]);
11191119
}
11201120

11211121
static void mlx5e_close_tis(struct mlx5e_priv *priv, int tc)
11221122
{
1123-
mlx5_destroy_tis(priv->mdev, priv->tisn[tc]);
1123+
mlx5_core_destroy_tis(priv->mdev, priv->tisn[tc]);
11241124
}
11251125

11261126
static int mlx5e_open_tises(struct mlx5e_priv *priv)
@@ -1326,7 +1326,7 @@ static int mlx5e_open_tir(struct mlx5e_priv *priv, int tt)
13261326

13271327
mlx5e_build_tir_ctx(priv, tirc, tt);
13281328

1329-
err = mlx5_create_tir(mdev, in, inlen, &priv->tirn[tt]);
1329+
err = mlx5_core_create_tir(mdev, in, inlen, &priv->tirn[tt]);
13301330

13311331
kvfree(in);
13321332

@@ -1335,7 +1335,7 @@ static int mlx5e_open_tir(struct mlx5e_priv *priv, int tt)
13351335

13361336
static void mlx5e_close_tir(struct mlx5e_priv *priv, int tt)
13371337
{
1338-
mlx5_destroy_tir(priv->mdev, priv->tirn[tt]);
1338+
mlx5_core_destroy_tir(priv->mdev, priv->tirn[tt]);
13391339
}
13401340

13411341
static int mlx5e_open_tirs(struct mlx5e_priv *priv)

‎drivers/net/ethernet/mellanox/mlx5/core/transobj.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "mlx5_core.h"
3535
#include "transobj.h"
3636

37-
int mlx5_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn)
37+
int mlx5_core_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn)
3838
{
3939
u32 out[MLX5_ST_SZ_DW(create_rq_out)];
4040
int err;
@@ -49,7 +49,7 @@ int mlx5_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn)
4949
return err;
5050
}
5151

52-
int mlx5_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen)
52+
int mlx5_core_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen)
5353
{
5454
u32 out[MLX5_ST_SZ_DW(modify_rq_out)];
5555

@@ -60,7 +60,7 @@ int mlx5_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen)
6060
return mlx5_cmd_exec_check_status(dev, in, inlen, out, sizeof(out));
6161
}
6262

63-
void mlx5_destroy_rq(struct mlx5_core_dev *dev, u32 rqn)
63+
void mlx5_core_destroy_rq(struct mlx5_core_dev *dev, u32 rqn)
6464
{
6565
u32 in[MLX5_ST_SZ_DW(destroy_rq_in)];
6666
u32 out[MLX5_ST_SZ_DW(destroy_rq_out)];
@@ -73,7 +73,7 @@ void mlx5_destroy_rq(struct mlx5_core_dev *dev, u32 rqn)
7373
mlx5_cmd_exec_check_status(dev, in, sizeof(in), out, sizeof(out));
7474
}
7575

76-
int mlx5_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn)
76+
int mlx5_core_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn)
7777
{
7878
u32 out[MLX5_ST_SZ_DW(create_sq_out)];
7979
int err;
@@ -88,7 +88,7 @@ int mlx5_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn)
8888
return err;
8989
}
9090

91-
int mlx5_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen)
91+
int mlx5_core_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen)
9292
{
9393
u32 out[MLX5_ST_SZ_DW(modify_sq_out)];
9494

@@ -99,7 +99,7 @@ int mlx5_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen)
9999
return mlx5_cmd_exec_check_status(dev, in, inlen, out, sizeof(out));
100100
}
101101

102-
void mlx5_destroy_sq(struct mlx5_core_dev *dev, u32 sqn)
102+
void mlx5_core_destroy_sq(struct mlx5_core_dev *dev, u32 sqn)
103103
{
104104
u32 in[MLX5_ST_SZ_DW(destroy_sq_in)];
105105
u32 out[MLX5_ST_SZ_DW(destroy_sq_out)];
@@ -112,7 +112,8 @@ void mlx5_destroy_sq(struct mlx5_core_dev *dev, u32 sqn)
112112
mlx5_cmd_exec_check_status(dev, in, sizeof(in), out, sizeof(out));
113113
}
114114

115-
int mlx5_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn)
115+
int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,
116+
u32 *tirn)
116117
{
117118
u32 out[MLX5_ST_SZ_DW(create_tir_out)];
118119
int err;
@@ -127,7 +128,7 @@ int mlx5_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn)
127128
return err;
128129
}
129130

130-
void mlx5_destroy_tir(struct mlx5_core_dev *dev, u32 tirn)
131+
void mlx5_core_destroy_tir(struct mlx5_core_dev *dev, u32 tirn)
131132
{
132133
u32 in[MLX5_ST_SZ_DW(destroy_tir_out)];
133134
u32 out[MLX5_ST_SZ_DW(destroy_tir_out)];
@@ -140,7 +141,8 @@ void mlx5_destroy_tir(struct mlx5_core_dev *dev, u32 tirn)
140141
mlx5_cmd_exec_check_status(dev, in, sizeof(in), out, sizeof(out));
141142
}
142143

143-
int mlx5_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn)
144+
int mlx5_core_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen,
145+
u32 *tisn)
144146
{
145147
u32 out[MLX5_ST_SZ_DW(create_tis_out)];
146148
int err;
@@ -155,7 +157,7 @@ int mlx5_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn)
155157
return err;
156158
}
157159

158-
void mlx5_destroy_tis(struct mlx5_core_dev *dev, u32 tisn)
160+
void mlx5_core_destroy_tis(struct mlx5_core_dev *dev, u32 tisn)
159161
{
160162
u32 in[MLX5_ST_SZ_DW(destroy_tis_out)];
161163
u32 out[MLX5_ST_SZ_DW(destroy_tis_out)];

‎drivers/net/ethernet/mellanox/mlx5/core/transobj.h

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,19 @@
3333
#ifndef __TRANSOBJ_H__
3434
#define __TRANSOBJ_H__
3535

36-
int mlx5_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *rqn);
37-
int mlx5_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen);
38-
void mlx5_destroy_rq(struct mlx5_core_dev *dev, u32 rqn);
39-
int mlx5_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *sqn);
40-
int mlx5_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen);
41-
void mlx5_destroy_sq(struct mlx5_core_dev *dev, u32 sqn);
42-
int mlx5_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn);
43-
void mlx5_destroy_tir(struct mlx5_core_dev *dev, u32 tirn);
44-
int mlx5_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn);
45-
void mlx5_destroy_tis(struct mlx5_core_dev *dev, u32 tisn);
36+
int mlx5_core_create_rq(struct mlx5_core_dev *dev, u32 *in, int inlen,
37+
u32 *rqn);
38+
int mlx5_core_modify_rq(struct mlx5_core_dev *dev, u32 rqn, u32 *in, int inlen);
39+
void mlx5_core_destroy_rq(struct mlx5_core_dev *dev, u32 rqn);
40+
int mlx5_core_create_sq(struct mlx5_core_dev *dev, u32 *in, int inlen,
41+
u32 *sqn);
42+
int mlx5_core_modify_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *in, int inlen);
43+
void mlx5_core_destroy_sq(struct mlx5_core_dev *dev, u32 sqn);
44+
int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen,
45+
u32 *tirn);
46+
void mlx5_core_destroy_tir(struct mlx5_core_dev *dev, u32 tirn);
47+
int mlx5_core_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen,
48+
u32 *tisn);
49+
void mlx5_core_destroy_tis(struct mlx5_core_dev *dev, u32 tisn);
4650

4751
#endif /* __TRANSOBJ_H__ */

0 commit comments

Comments
 (0)