Commit 0c4accc4 authored Dec 01, 2020 by YueHaibing Committed by Saeed Mahameed Dec 08, 2020

net/mlx5: Fix passing zero to 'PTR_ERR'

Fix smatch warnings:

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c:105 esw_acl_egress_lgcy_setup() warn: passing zero to 'PTR_ERR'
drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c:177 esw_acl_egress_ofld_setup() warn: passing zero to 'PTR_ERR'
drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c:184 esw_acl_ingress_lgcy_setup() warn: passing zero to 'PTR_ERR'
drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c:262 esw_acl_ingress_ofld_setup() warn: passing zero to 'PTR_ERR'

esw_acl_table_create() never returns NULL, so
NULL test should be removed.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

parent d894892d

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ int esw_acl_egress_lgcy_setup(struct mlx5_eswitch *esw,
		vport->egress.acl = esw_acl_table_create(esw, vport->vport,
		MLX5_FLOW_NAMESPACE_ESW_EGRESS,
		table_size);
		if (IS_ERR_OR_NULL(vport->egress.acl)) {
		if (IS_ERR(vport->egress.acl)) {
		err = PTR_ERR(vport->egress.acl);
		vport->egress.acl = NULL;
		goto out;

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ int esw_acl_egress_ofld_setup(struct mlx5_eswitch esw, struct mlx5_vport vport
		table_size++;
		vport->egress.acl = esw_acl_table_create(esw, vport->vport,
		MLX5_FLOW_NAMESPACE_ESW_EGRESS, table_size);
		if (IS_ERR_OR_NULL(vport->egress.acl)) {
		if (IS_ERR(vport->egress.acl)) {
		err = PTR_ERR(vport->egress.acl);
		vport->egress.acl = NULL;
		return err;

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw,
		vport->ingress.acl = esw_acl_table_create(esw, vport->vport,
		MLX5_FLOW_NAMESPACE_ESW_INGRESS,
		table_size);
		if (IS_ERR_OR_NULL(vport->ingress.acl)) {
		if (IS_ERR(vport->ingress.acl)) {
		err = PTR_ERR(vport->ingress.acl);
		vport->ingress.acl = NULL;
		return err;

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ int esw_acl_ingress_ofld_setup(struct mlx5_eswitch *esw,
		vport->ingress.acl = esw_acl_table_create(esw, vport->vport,
		MLX5_FLOW_NAMESPACE_ESW_INGRESS,
		num_ftes);
		if (IS_ERR_OR_NULL(vport->ingress.acl)) {
		if (IS_ERR(vport->ingress.acl)) {
		err = PTR_ERR(vport->ingress.acl);
		vport->ingress.acl = NULL;
		return err;