On Tue, 2019-09-03 at 20:08 +0000, Saeed Mahameed wrote: > On Tue, 2019-09-03 at 14:56 +0800, zhong jiang wrote: > > PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR. It is better > > to use it directly. hence just replace it. > > > > Signed-off-by: zhong jiang <zhongji...@huawei.com> > > --- > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > index 5581a80..2e0b467 100644 > > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > @@ -989,10 +989,7 @@ static void mlx5e_hairpin_flow_del(struct > > mlx5e_priv *priv, > > &flow_act, dest, dest_ix); > > mutex_unlock(&priv->fs.tc.t_lock); > > > > - if (IS_ERR(flow->rule[0])) > > - return PTR_ERR(flow->rule[0]); > > - > > - return 0; > > + return PTR_ERR_OR_ZERO(flow->rule[0]); > > } > > > > static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv, > > Acked-by: Saeed Mahameed <sae...@mellanox.com>
Applied to net-next-mlx5 as i have a cleanup series coming up soon. Thanks, Saeed.