2020-05-15 23:08:26

by Tang Bin

Subject: [PATCH v2] net/mlx5e: Use IS_ERR() to check and simplify code

Use IS_ERR() and PTR_ERR() instead of PTR_ERR_OR_ZERO() to
simplify code, avoid redundant judgements.

Signed-off-by: Zhang Shengju <[email protected]>
Signed-off-by: Tang Bin <[email protected]>
Reviewed-by: Leon Romanovsky <[email protected]>
---
Changes from v1
- fix the commit message for typo.
---
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index af4ebd295..00e7add0b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -93,9 +93,8 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv,
}

rt = ip_route_output_key(dev_net(mirred_dev), fl4);
- ret = PTR_ERR_OR_ZERO(rt);
- if (ret)
- return ret;
+ if (IS_ERR(rt))
+ return PTR_ERR(rt);

if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET) {
ip_rt_put(rt);
--
2.20.1.windows.1

2020-05-18 16:27:46

by Saeed Mahameed

Subject: Re: [PATCH v2] net/mlx5e: Use IS_ERR() to check and simplify code

On Sat, 2020-05-16 at 07:06 +0800, Tang Bin wrote:
> Use IS_ERR() and PTR_ERR() instead of PTR_ERR_OR_ZERO() to
> simplify code, avoid redundant judgements.
>
> Signed-off-by: Zhang Shengju <[email protected]>
> Signed-off-by: Tang Bin <[email protected]>
> Reviewed-by: Leon Romanovsky <[email protected]>
> ---
> Changes from v1
> - fix the commit message for typo.
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>

Applied to net-next-mlx5

Thanks,
Saeed.