Skip to content

Commit 0025b0b

Browse files
committed
IB/mlx5: Make coding style more consistent
These three related functions can't agree whether to put the umrwr on the stack dirty and then memset it, or to initialize it on the stack. Make them all agree. Signed-off-by: Doug Ledford <[email protected]>
1 parent add08d7 commit 0025b0b

File tree

1 file changed

+2
-4
lines changed
  • drivers/infiniband/hw/mlx5

1 file changed

+2
-4
lines changed

drivers/infiniband/hw/mlx5/mr.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
860860
struct device *ddev = dev->ib_dev.dma_device;
861861
struct umr_common *umrc = &dev->umrc;
862862
struct mlx5_ib_umr_context umr_context;
863-
struct mlx5_umr_wr umrwr;
863+
struct mlx5_umr_wr umrwr = {};
864864
struct ib_send_wr *bad;
865865
struct mlx5_ib_mr *mr;
866866
struct ib_sge sg;
@@ -892,7 +892,6 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
892892

893893
mlx5_ib_init_umr_context(&umr_context);
894894

895-
memset(&umrwr, 0, sizeof(umrwr));
896895
umrwr.wr.wr_cqe = &umr_context.cqe;
897896
prep_umr_reg_wqe(pd, &umrwr.wr, &sg, dma, npages, mr->mmkey.key,
898897
page_shift, virt_addr, len, access_flags);
@@ -1196,13 +1195,12 @@ static int unreg_umr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)
11961195
{
11971196
struct umr_common *umrc = &dev->umrc;
11981197
struct mlx5_ib_umr_context umr_context;
1199-
struct mlx5_umr_wr umrwr;
1198+
struct mlx5_umr_wr umrwr = {};
12001199
struct ib_send_wr *bad;
12011200
int err;
12021201

12031202
mlx5_ib_init_umr_context(&umr_context);
12041203

1205-
memset(&umrwr.wr, 0, sizeof(umrwr));
12061204
umrwr.wr.wr_cqe = &umr_context.cqe;
12071205
prep_umr_unreg_wqe(dev, &umrwr.wr, mr->mmkey.key);
12081206

0 commit comments

Comments
 (0)