net/mlx5: Use PTR_ERR_OR_ZERO() to simplify the code
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 19 Jul 2016 11:35:46 +0000 (11:35 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Jul 2016 21:46:00 +0000 (14:46 -0700)
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR.

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

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

index 1a377b403321aa6160152cb810b6c5116a2262d9..75bb8c8645575058324c4807356586055f13da3b 100644 (file)
@@ -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)