From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Georgi Djakov <georgi.djakov@linaro.org>
Cc: linux-pm@vger.kernel.org, agross@kernel.org, digetx@gmail.com,
evgreen@chromium.org, daidavid1@codeaurora.org,
masneyb@onstation.org, sibis@codeaurora.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH v2 5/5] interconnect: qcom: Use the new common helper for node removal
Date: Mon, 2 Dec 2019 09:40:20 -0800 [thread overview]
Message-ID: <20191202174020.GE133384@yoga> (raw)
In-Reply-To: <20191202162133.7089-5-georgi.djakov@linaro.org>
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@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> 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[] = {
next prev parent reply other threads:[~2019-12-02 17:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 16:21 [PATCH v2 1/5] interconnect: qcom: sdm845: Walk the list safely on node removal Georgi Djakov
2019-12-02 16:21 ` [PATCH v2 2/5] interconnect: qcom: qcs404: " Georgi Djakov
2019-12-02 17:37 ` Bjorn Andersson
2019-12-02 16:21 ` [PATCH v2 3/5] interconnect: qcom: msm8974: " Georgi Djakov
2019-12-02 17:37 ` Bjorn Andersson
2019-12-02 16:21 ` [PATCH v2 4/5] interconnect: Add a common helper for removing all nodes Georgi Djakov
2019-12-02 16:21 ` [PATCH v2 5/5] interconnect: qcom: Use the new common helper for node removal Georgi Djakov
2019-12-02 17:40 ` Bjorn Andersson [this message]
2019-12-02 17:36 ` [PATCH v2 1/5] interconnect: qcom: sdm845: Walk the list safely on " Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191202174020.GE133384@yoga \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=daidavid1@codeaurora.org \
--cc=digetx@gmail.com \
--cc=evgreen@chromium.org \
--cc=georgi.djakov@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=sibis@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).