Re: [PATCH v2 5/5] interconnect: qcom: Use the new common helper for node removal

[Bjorn Andersson]

On Mon 02 Dec 08:21 PST 2019, Georgi Djakov wrote:

> There is a new helper function for removing all nodes. Let's use it instead
> of duplicating the code.
> 
> Signed-off-by: Georgi Djakov <georgi.djakov@xxxxxxxxxx>

Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>

> ---
> v2:
> - Don't call qnoc_remove() directly from probe. (Dmitry)
> 
>  drivers/interconnect/qcom/msm8974.c | 17 ++++-------------
>  drivers/interconnect/qcom/qcs404.c  | 17 ++++-------------
>  drivers/interconnect/qcom/sdm845.c  | 16 +++-------------
>  3 files changed, 11 insertions(+), 39 deletions(-)
> 
> diff --git a/drivers/interconnect/qcom/msm8974.c b/drivers/interconnect/qcom/msm8974.c
> index ca25f31e5f0b..3a313e11e73d 100644
> --- a/drivers/interconnect/qcom/msm8974.c
> +++ b/drivers/interconnect/qcom/msm8974.c
> @@ -643,7 +643,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;
>  
> @@ -723,10 +723,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:
> @@ -738,16 +735,10 @@ static int msm8974_icc_probe(struct platform_device *pdev)
>  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 9064f6bdaa69..d4769a5ea182 100644
> --- a/drivers/interconnect/qcom/qcs404.c
> +++ b/drivers/interconnect/qcom/qcs404.c
> @@ -405,7 +405,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;
>  
> @@ -485,10 +485,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);
>  
> @@ -498,16 +495,10 @@ static int qnoc_probe(struct platform_device *pdev)
>  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 387267ee9648..f078cf0fce56 100644
> --- 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 @@ static int qnoc_probe(struct platform_device *pdev)
>  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[] = {