From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: spin-table: add missing of_node_put()
Date: Wed, 20 Apr 2016 10:17:55 +0100 [thread overview]
Message-ID: <20160420091755.GC30601@arm.com> (raw)
In-Reply-To: <1461115411-2843-1-git-send-email-yamada.masahiro@socionext.com>
On Wed, Apr 20, 2016 at 10:23:31AM +0900, Masahiro Yamada wrote:
> Since of_get_cpu_node() increments refcount, the node should be put.
Urgh, I really hate the dt refcounting stuff.
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> arch/arm64/kernel/smp_spin_table.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c
> index aef3605..18a71bc 100644
> --- a/arch/arm64/kernel/smp_spin_table.c
> +++ b/arch/arm64/kernel/smp_spin_table.c
> @@ -52,6 +52,7 @@ static void write_pen_release(u64 val)
> static int smp_spin_table_cpu_init(unsigned int cpu)
> {
> struct device_node *dn;
> + int ret;
>
> dn = of_get_cpu_node(cpu, NULL);
> if (!dn)
> @@ -60,15 +61,15 @@ static int smp_spin_table_cpu_init(unsigned int cpu)
> /*
> * Determine the address from which the CPU is polling.
> */
> - if (of_property_read_u64(dn, "cpu-release-addr",
> - &cpu_release_addr[cpu])) {
> + ret = of_property_read_u64(dn, "cpu-release-addr",
> + &cpu_release_addr[cpu]);
> + if (ret)
> pr_err("CPU %d: missing or invalid cpu-release-addr property\n",
> cpu);
>
> - return -1;
> - }
> + of_node_put(dn);
>
> - return 0;
> + return ret;
Looks ok to me. The slight change in return code should be harmless for
->cpu_init.
Acked-by: Will Deacon <will.deacon@arm.com>
Will
next prev parent reply other threads:[~2016-04-20 9:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 1:23 [PATCH] arm64: spin-table: add missing of_node_put() Masahiro Yamada
2016-04-20 9:17 ` Will Deacon [this message]
2016-04-20 9:35 ` Catalin Marinas
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=20160420091755.GC30601@arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.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).