Commit ad3703ac authored by Georgi Djakov's avatar Georgi Djakov
Browse files

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: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>
parent 3cce2c6f

drivers/interconnect/qcom/msm8974.c

+4 −13
Original line number Diff line number Diff line
@@ -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[] = {

drivers/interconnect/qcom/qcs404.c

+4 −13
Original line number Diff line number Diff line
@@ -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[] = {

drivers/interconnect/qcom/sdm845.c

+3 −13
Original line number Diff line number Diff line
@@ -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[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE