* [PATCH net-next] net/mlx5: Use PTR_ERR_OR_ZERO() to simplify code
@ 2023-08-22 6:23 Jinjie Ruan
2023-08-23 19:45 ` Jacob Keller
2023-08-25 18:02 ` Saeed Mahameed
0 siblings, 2 replies; 3+ messages in thread
From: Jinjie Ruan @ 2023-08-22 6:23 UTC (permalink / raw)
To: netdev, linux-rdma, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: ruanjinjie
Return PTR_ERR_OR_ZERO() instead of return 0 or PTR_ERR() to
simplify code.
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 8 ++------
drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 10 ++--------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index 934b0d5ce1b3..777d311d44ef 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@ -1283,9 +1283,7 @@ static int mlx5e_create_inner_ttc_table(struct mlx5e_flow_steering *fs,
mlx5e_set_inner_ttc_params(fs, rx_res, &ttc_params);
fs->inner_ttc = mlx5_create_inner_ttc_table(fs->mdev,
&ttc_params);
- if (IS_ERR(fs->inner_ttc))
- return PTR_ERR(fs->inner_ttc);
- return 0;
+ return PTR_ERR_OR_ZERO(fs->inner_ttc);
}
int mlx5e_create_ttc_table(struct mlx5e_flow_steering *fs,
@@ -1295,9 +1293,7 @@ int mlx5e_create_ttc_table(struct mlx5e_flow_steering *fs,
mlx5e_set_ttc_params(fs, rx_res, &ttc_params, true);
fs->ttc = mlx5_create_ttc_table(fs->mdev, &ttc_params);
- if (IS_ERR(fs->ttc))
- return PTR_ERR(fs->ttc);
- return 0;
+ return PTR_ERR_OR_ZERO(fs->ttc);
}
int mlx5e_create_flow_steering(struct mlx5e_flow_steering *fs,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
index 7d9bbb494d95..101b3bb90863 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
@@ -507,10 +507,7 @@ static int mlx5_lag_create_ttc_table(struct mlx5_lag *ldev)
mlx5_lag_set_outer_ttc_params(ldev, &ttc_params);
port_sel->outer.ttc = mlx5_create_ttc_table(dev, &ttc_params);
- if (IS_ERR(port_sel->outer.ttc))
- return PTR_ERR(port_sel->outer.ttc);
-
- return 0;
+ return PTR_ERR_OR_ZERO(port_sel->outer.ttc);
}
static int mlx5_lag_create_inner_ttc_table(struct mlx5_lag *ldev)
@@ -521,10 +518,7 @@ static int mlx5_lag_create_inner_ttc_table(struct mlx5_lag *ldev)
mlx5_lag_set_inner_ttc_params(ldev, &ttc_params);
port_sel->inner.ttc = mlx5_create_inner_ttc_table(dev, &ttc_params);
- if (IS_ERR(port_sel->inner.ttc))
- return PTR_ERR(port_sel->inner.ttc);
-
- return 0;
+ return PTR_ERR_OR_ZERO(port_sel->inner.ttc);
}
int mlx5_lag_port_sel_create(struct mlx5_lag *ldev,
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net/mlx5: Use PTR_ERR_OR_ZERO() to simplify code
2023-08-22 6:23 [PATCH net-next] net/mlx5: Use PTR_ERR_OR_ZERO() to simplify code Jinjie Ruan
@ 2023-08-23 19:45 ` Jacob Keller
2023-08-25 18:02 ` Saeed Mahameed
1 sibling, 0 replies; 3+ messages in thread
From: Jacob Keller @ 2023-08-23 19:45 UTC (permalink / raw)
To: Jinjie Ruan, netdev, linux-rdma, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
On 8/21/2023 11:23 PM, Jinjie Ruan wrote:
> Return PTR_ERR_OR_ZERO() instead of return 0 or PTR_ERR() to
> simplify code.
>
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 8 ++------
> drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 10 ++--------
> 2 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> index 934b0d5ce1b3..777d311d44ef 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> @@ -1283,9 +1283,7 @@ static int mlx5e_create_inner_ttc_table(struct mlx5e_flow_steering *fs,
> mlx5e_set_inner_ttc_params(fs, rx_res, &ttc_params);
> fs->inner_ttc = mlx5_create_inner_ttc_table(fs->mdev,
> &ttc_params);
> - if (IS_ERR(fs->inner_ttc))
> - return PTR_ERR(fs->inner_ttc);
> - return 0;
> + return PTR_ERR_OR_ZERO(fs->inner_ttc);
> }
>
> int mlx5e_create_ttc_table(struct mlx5e_flow_steering *fs,
> @@ -1295,9 +1293,7 @@ int mlx5e_create_ttc_table(struct mlx5e_flow_steering *fs,
>
> mlx5e_set_ttc_params(fs, rx_res, &ttc_params, true);
> fs->ttc = mlx5_create_ttc_table(fs->mdev, &ttc_params);
> - if (IS_ERR(fs->ttc))
> - return PTR_ERR(fs->ttc);
> - return 0;
> + return PTR_ERR_OR_ZERO(fs->ttc);
> }
>
> int mlx5e_create_flow_steering(struct mlx5e_flow_steering *fs,
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
> index 7d9bbb494d95..101b3bb90863 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
> @@ -507,10 +507,7 @@ static int mlx5_lag_create_ttc_table(struct mlx5_lag *ldev)
>
> mlx5_lag_set_outer_ttc_params(ldev, &ttc_params);
> port_sel->outer.ttc = mlx5_create_ttc_table(dev, &ttc_params);
> - if (IS_ERR(port_sel->outer.ttc))
> - return PTR_ERR(port_sel->outer.ttc);
> -
> - return 0;
> + return PTR_ERR_OR_ZERO(port_sel->outer.ttc);
> }
>
> static int mlx5_lag_create_inner_ttc_table(struct mlx5_lag *ldev)
> @@ -521,10 +518,7 @@ static int mlx5_lag_create_inner_ttc_table(struct mlx5_lag *ldev)
>
> mlx5_lag_set_inner_ttc_params(ldev, &ttc_params);
> port_sel->inner.ttc = mlx5_create_inner_ttc_table(dev, &ttc_params);
> - if (IS_ERR(port_sel->inner.ttc))
> - return PTR_ERR(port_sel->inner.ttc);
> -
> - return 0;
> + return PTR_ERR_OR_ZERO(port_sel->inner.ttc);
> }
>
> int mlx5_lag_port_sel_create(struct mlx5_lag *ldev,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net/mlx5: Use PTR_ERR_OR_ZERO() to simplify code
2023-08-22 6:23 [PATCH net-next] net/mlx5: Use PTR_ERR_OR_ZERO() to simplify code Jinjie Ruan
2023-08-23 19:45 ` Jacob Keller
@ 2023-08-25 18:02 ` Saeed Mahameed
1 sibling, 0 replies; 3+ messages in thread
From: Saeed Mahameed @ 2023-08-25 18:02 UTC (permalink / raw)
To: Jinjie Ruan
Cc: netdev, linux-rdma, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
On 22 Aug 14:23, Jinjie Ruan wrote:
>Return PTR_ERR_OR_ZERO() instead of return 0 or PTR_ERR() to
>simplify code.
>
>Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Applied to net-next-mlx5
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-25 18:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-22 6:23 [PATCH net-next] net/mlx5: Use PTR_ERR_OR_ZERO() to simplify code Jinjie Ruan
2023-08-23 19:45 ` Jacob Keller
2023-08-25 18:02 ` Saeed Mahameed
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox