2020-12-09 01:24:53

by Zheng Yongjun

Subject: [PATCH v2 net-next] net/mlx4: simplify the return expression of mlx4_init_cq_table()

Simplify the return expression.

Signed-off-by: Zheng Yongjun <[email protected]>
---
drivers/net/ethernet/mellanox/mlx4/cq.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index 3b8576b9c2f9..f7053a74e6a8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -462,19 +462,14 @@ EXPORT_SYMBOL_GPL(mlx4_cq_free);
int mlx4_init_cq_table(struct mlx4_dev *dev)
{
struct mlx4_cq_table *cq_table = &mlx4_priv(dev)->cq_table;
- int err;

spin_lock_init(&cq_table->lock);
INIT_RADIX_TREE(&cq_table->tree, GFP_ATOMIC);
if (mlx4_is_slave(dev))
return 0;

- err = mlx4_bitmap_init(&cq_table->bitmap, dev->caps.num_cqs,
- dev->caps.num_cqs - 1, dev->caps.reserved_cqs, 0);
- if (err)
- return err;
-
- return 0;
+ return mlx4_bitmap_init(&cq_table->bitmap, dev->caps.num_cqs,
+ dev->caps.num_cqs - 1, dev->caps.reserved_cqs, 0);
}

void mlx4_cleanup_cq_table(struct mlx4_dev *dev)
--
2.22.0

2020-12-10 13:52:56

by David Miller

Subject: Re: [PATCH v2 net-next] net/mlx4: simplify the return expression of mlx4_init_cq_table()

From: Zheng Yongjun <[email protected]>
Date: Wed, 9 Dec 2020 09:20:02 +0800

> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>

Applied.