Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44fafdaa authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

net/mlx5: Use PTR_ERR_OR_ZERO() to simplify the code 



Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR.

Generated by: scripts/coccinelle/api/ptr_ret.cocci

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a7bae8a

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+2 −8
Original line number Diff line number Diff line
@@ -1740,10 +1740,7 @@ static int init_ingress_acl_root_ns(struct mlx5_flow_steering *steering) 
	/* create 1 prio*/

	prio = fs_create_prio(&steering->esw_egress_root_ns->ns, 0,

			      MLX5_TOTAL_VPORTS(steering->dev));

	if (IS_ERR(prio))

		return PTR_ERR(prio);

	else

		return 0;

	return PTR_ERR_OR_ZERO(prio);

}



static int init_egress_acl_root_ns(struct mlx5_flow_steering *steering)
@@ -1757,10 +1754,7 @@ static int init_egress_acl_root_ns(struct mlx5_flow_steering *steering) 
	/* create 1 prio*/

	prio = fs_create_prio(&steering->esw_ingress_root_ns->ns, 0,

			      MLX5_TOTAL_VPORTS(steering->dev));

	if (IS_ERR(prio))

		return PTR_ERR(prio);

	else

		return 0;

	return PTR_ERR_OR_ZERO(prio);

}



int mlx5_init_fs(struct mlx5_core_dev *dev)