[PATCH v3 33/36] regex/*: remove unnecessary NULL checks
Stephen Hemminger
stephen at networkplumber.org
Wed Feb 9 20:17:45 CET 2022
Remove redundant NULL pointer checks before free functions
found by nullfree.cocci
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Liron Himi <lironh at marvell.com>
---
drivers/regex/cn9k/cn9k_regexdev.c | 6 ++----
drivers/regex/cn9k/cn9k_regexdev_compiler.c | 3 +--
drivers/regex/mlx5/mlx5_regex.c | 3 +--
drivers/regex/mlx5/mlx5_rxp.c | 3 +--
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/regex/cn9k/cn9k_regexdev.c b/drivers/regex/cn9k/cn9k_regexdev.c
index 32d20c1be82b..56c862c5a76c 100644
--- a/drivers/regex/cn9k/cn9k_regexdev.c
+++ b/drivers/regex/cn9k/cn9k_regexdev.c
@@ -256,10 +256,8 @@ ree_dev_fini(struct rte_regexdev *dev)
cn9k_err("Could not detach queues");
/* TEMP : should be in lib */
- if (data->queue_pairs)
- rte_free(data->queue_pairs);
- if (data->rules)
- rte_free(data->rules);
+ rte_free(data->queue_pairs);
+ rte_free(data->rules);
roc_ree_dev_fini(vf);
diff --git a/drivers/regex/cn9k/cn9k_regexdev_compiler.c b/drivers/regex/cn9k/cn9k_regexdev_compiler.c
index 935b8a53b459..60f1c1b4c4d8 100644
--- a/drivers/regex/cn9k/cn9k_regexdev_compiler.c
+++ b/drivers/regex/cn9k/cn9k_regexdev_compiler.c
@@ -214,8 +214,7 @@ cn9k_ree_rule_db_compile_prog(struct rte_regexdev *dev)
rxp_free_structs(NULL, NULL, NULL, NULL, NULL, &rof, NULL, &rofi, NULL,
1);
- if (rule_db)
- rte_free(rule_db);
+ rte_free(rule_db);
return ret;
}
diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index e5a12fb3cc4d..48e39f6b8844 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -127,8 +127,7 @@ mlx5_regex_dev_probe(struct mlx5_common_device *cdev)
if (priv->regexdev)
rte_regexdev_unregister(priv->regexdev);
dev_error:
- if (priv)
- rte_free(priv);
+ rte_free(priv);
return -rte_errno;
}
diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index 5ead3ca341ad..99db1e4a865c 100644
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -166,7 +166,6 @@ mlx5_regex_configure(struct rte_regexdev *dev,
DRV_LOG(DEBUG, "Regex config without rules programming!");
return 0;
configure_error:
- if (priv->qps)
- rte_free(priv->qps);
+ rte_free(priv->qps);
return -rte_errno;
}
--
2.34.1
More information about the dev
mailing list