interconnect: qcom: Use the new common helper for node removal

There is a new helper function for removing all nodes. Let's use it instead
of duplicating the code.

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>

diff --git a/drivers/interconnect/qcom/msm8974.c b/drivers/interconnect/qcom/msm8974.c
index bf8bd1aee358dd52fcfd99f8a1541c5f394463c6..e669a1f726d2eac48a8e467039efcd4513712172 100644 (file)
--- a/drivers/interconnect/qcom/msm8974.c
+++ b/drivers/interconnect/qcom/msm8974.c
@@ -652,7 +652,7 @@ static int msm8974_icc_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct icc_onecell_data *data;
        struct icc_provider *provider;
-       struct icc_node *node, *tmp;
+       struct icc_node *node;
        size_t num_nodes, i;
        int ret;
 
@@ -732,10 +732,7 @@ static int msm8974_icc_probe(struct platform_device *pdev)
        return 0;
 
 err_del_icc:
-       list_for_each_entry_safe(node, tmp, &provider->nodes, node_list) {
-               icc_node_del(node);
-               icc_node_destroy(node->id);
-       }
+       icc_nodes_remove(provider);
        icc_provider_del(provider);
 
 err_disable_clks:
@@ -747,16 +744,10 @@ err_disable_clks:
 static int msm8974_icc_remove(struct platform_device *pdev)
 {
        struct msm8974_icc_provider *qp = platform_get_drvdata(pdev);
-       struct icc_provider *provider = &qp->provider;
-       struct icc_node *n, *tmp;
 
-       list_for_each_entry_safe(n, tmp, &provider->nodes, node_list) {
-               icc_node_del(n);
-               icc_node_destroy(n->id);
-       }
+       icc_nodes_remove(&qp->provider);
        clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);
-
-       return icc_provider_del(provider);
+       return icc_provider_del(&qp->provider);
 }
 
 static const struct of_device_id msm8974_noc_of_match[] = {

diff --git a/drivers/interconnect/qcom/qcs404.c b/drivers/interconnect/qcom/qcs404.c
index 8e0735a87040029f7854f70390de5596f0f88860..c8eb1276cce885be1cbe6bf4795ccae7cd31aa76 100644 (file)
--- a/drivers/interconnect/qcom/qcs404.c
+++ b/drivers/interconnect/qcom/qcs404.c
@@ -414,7 +414,7 @@ static int qnoc_probe(struct platform_device *pdev)
        struct icc_provider *provider;
        struct qcom_icc_node **qnodes;
        struct qcom_icc_provider *qp;
-       struct icc_node *node, *tmp;
+       struct icc_node *node;
        size_t num_nodes, i;
        int ret;
 
@@ -494,10 +494,7 @@ static int qnoc_probe(struct platform_device *pdev)
 
        return 0;
 err:
-       list_for_each_entry_safe(node, tmp, &provider->nodes, node_list) {
-               icc_node_del(node);
-               icc_node_destroy(node->id);
-       }
+       icc_nodes_remove(provider);
        clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);
        icc_provider_del(provider);
 
@@ -507,16 +504,10 @@ err:
 static int qnoc_remove(struct platform_device *pdev)
 {
        struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
-       struct icc_provider *provider = &qp->provider;
-       struct icc_node *n, *tmp;
 
-       list_for_each_entry_safe(n, tmp, &provider->nodes, node_list) {
-               icc_node_del(n);
-               icc_node_destroy(n->id);
-       }
+       icc_nodes_remove(&qp->provider);
        clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);
-
-       return icc_provider_del(provider);
+       return icc_provider_del(&qp->provider);
 }
 
 static const struct of_device_id qcs404_noc_of_match[] = {

diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
index 387267ee9648509fa39bac0c25c5fd6db1fe1c46..f078cf0fce563694132d03cd55ebbfb36d4eccaa 100644 (file)
--- a/drivers/interconnect/qcom/sdm845.c
+++ b/drivers/interconnect/qcom/sdm845.c
@@ -855,11 +855,7 @@ static int qnoc_probe(struct platform_device *pdev)
 
        return ret;
 err:
-       list_for_each_entry(node, &provider->nodes, node_list) {
-               icc_node_del(node);
-               icc_node_destroy(node->id);
-       }
-
+       icc_nodes_remove(provider);
        icc_provider_del(provider);
        return ret;
 }
@@ -867,15 +863,9 @@ err:
 static int qnoc_remove(struct platform_device *pdev)
 {
        struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
-       struct icc_provider *provider = &qp->provider;
-       struct icc_node *n, *tmp;
-
-       list_for_each_entry_safe(n, tmp, &provider->nodes, node_list) {
-               icc_node_del(n);
-               icc_node_destroy(n->id);
-       }
 
-       return icc_provider_del(provider);
+       icc_nodes_remove(&qp->provider);
+       return icc_provider_del(&qp->provider);
 }
 
 static const struct of_device_id qnoc_of_match[] = {