Message ID | 20200515230633.2832-1-tangbin@cmss.chinamobile.com |
---|---|
State | Awaiting Upstream |
Delegated to: | David Miller |
Headers | show |
Series | [v2] net/mlx5e: Use IS_ERR() to check and simplify code | expand |
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 <zhangshengju@cmss.chinamobile.com> > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> > Reviewed-by: Leon Romanovsky <leonro@mellanox.com> > --- > 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.
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);