2020-12-10 14:49:54

by Zheng Yongjun

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

Simplify the return expression.

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

diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index cbe4d9746ddf..dd890f5d7b72 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -272,19 +272,14 @@ EXPORT_SYMBOL_GPL(mlx4_srq_query);
int mlx4_init_srq_table(struct mlx4_dev *dev)
{
struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
- int err;

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

- err = mlx4_bitmap_init(&srq_table->bitmap, dev->caps.num_srqs,
- dev->caps.num_srqs - 1, dev->caps.reserved_srqs, 0);
- if (err)
- return err;
-
- return 0;
+ return mlx4_bitmap_init(&srq_table->bitmap, dev->caps.num_srqs,
+ dev->caps.num_srqs - 1, dev->caps.reserved_srqs, 0);
}

void mlx4_cleanup_srq_table(struct mlx4_dev *dev)
--
2.22.0

2020-12-10 21:05:17

by David Miller

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

From: Zheng Yongjun <[email protected]>
Date: Thu, 10 Dec 2020 21:50:00 +0800

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

Applied.