In pxa_dt_irq_init(), of_find_matching_node() will return a node
pointer with refcount incremented. We should use of_node_put in
fail path or when it is not used anymore. This goto-label patch
style is advised by Daniel.
Signed-off-by: heliang <[email protected]>
---
arch/arm/mach-pxa/irq.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 96f33ef1d9ea..338356b9f37c 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -247,13 +247,13 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
&pxa_internal_irq_nr);
if (ret) {
pr_err("Not found marvell,intc-nr-irqs property\n");
- return;
+ goto out_put;
}
ret = of_address_to_resource(node, 0, &res);
if (ret < 0) {
pr_err("No registers defined for node\n");
- return;
+ goto out_put;
}
pxa_irq_base = io_p2v(res.start);
@@ -263,9 +263,12 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
ret = irq_alloc_descs(-1, 0, pxa_internal_irq_nr, 0);
if (ret < 0) {
pr_err("Failed to allocate IRQ numbers\n");
- return;
+ goto out_put;
}
pxa_init_irq_common(node, pxa_internal_irq_nr, fn);
+
+out_put:
+ of_node_put(node);
}
#endif /* CONFIG_OF */
--
2.25.1
On 6/15/22 12:33, heliang wrote:
> In pxa_dt_irq_init(), of_find_matching_node() will return a node
> pointer with refcount incremented. We should use of_node_put in
> fail path or when it is not used anymore. This goto-label patch
> style is advised by Daniel.
>
> Signed-off-by: heliang <[email protected]>
Thanks for your patch!
Acked-by: Daniel Mack <[email protected]>
> ---
> arch/arm/mach-pxa/irq.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
> index 96f33ef1d9ea..338356b9f37c 100644
> --- a/arch/arm/mach-pxa/irq.c
> +++ b/arch/arm/mach-pxa/irq.c
> @@ -247,13 +247,13 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
> &pxa_internal_irq_nr);
> if (ret) {
> pr_err("Not found marvell,intc-nr-irqs property\n");
> - return;
> + goto out_put;
> }
>
> ret = of_address_to_resource(node, 0, &res);
> if (ret < 0) {
> pr_err("No registers defined for node\n");
> - return;
> + goto out_put;
> }
> pxa_irq_base = io_p2v(res.start);
>
> @@ -263,9 +263,12 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
> ret = irq_alloc_descs(-1, 0, pxa_internal_irq_nr, 0);
> if (ret < 0) {
> pr_err("Failed to allocate IRQ numbers\n");
> - return;
> + goto out_put;
> }
>
> pxa_init_irq_common(node, pxa_internal_irq_nr, fn);
> +
> +out_put:
> + of_node_put(node);
> }
> #endif /* CONFIG_OF */
On 15/06/2022 11:33, heliang wrote:
> [PATCH] [Re-PATCH] arch: arm: mach-pxa: Add missing of_node_put in irq.c
You mean [PATCH v2]? Pass -v N arg to format-patch & it'll do it
for you.
> In pxa_dt_irq_init(), of_find_matching_node() will return a node
> pointer with refcount incremented. We should use of_node_put in
> fail path or when it is not used anymore. This goto-label patch
> style is advised by Daniel.
>
> Signed-off-by: heliang <[email protected]>
On all these patches, is "heliang" your (full) real name?
See:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#developer-s-certificate-of-origin-1-1
> ---
It's helpful to put a changelog here too for what changed since v1
> arch/arm/mach-pxa/irq.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
> index 96f33ef1d9ea..338356b9f37c 100644
> --- a/arch/arm/mach-pxa/irq.c
> +++ b/arch/arm/mach-pxa/irq.c
> @@ -247,13 +247,13 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
> &pxa_internal_irq_nr);
> if (ret) {
> pr_err("Not found marvell,intc-nr-irqs property\n");
> - return;
> + goto out_put;
> }
>
> ret = of_address_to_resource(node, 0, &res);
> if (ret < 0) {
> pr_err("No registers defined for node\n");
> - return;
> + goto out_put;
> }
> pxa_irq_base = io_p2v(res.start);
>
> @@ -263,9 +263,12 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
> ret = irq_alloc_descs(-1, 0, pxa_internal_irq_nr, 0);
> if (ret < 0) {
> pr_err("Failed to allocate IRQ numbers\n");
> - return;
> + goto out_put;
> }
>
> pxa_init_irq_common(node, pxa_internal_irq_nr, fn);
> +
> +out_put:
> + of_node_put(node);
> }
> #endif /* CONFIG_OF */
On 15/06/2022 12:25, [email protected] wrote:
> Sorry for my trouble. So I wonder if I have to make another version patch to complete these tasks in this commit:
>
> (1) use -v N to automatically mean [PATCH v2]
> (2) use a formal real name, my real name is Liang He
This one needs to be a resend I think, so (1) applies too
> (3) add changelog
And since you're resending anyway, yeah add a changelog.
Thanks,
Conor.
>
> or complete these tasks in future patch commit?
>
> Thanks!
>
> Liang
>
>
> ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
> [email protected]
>
> *From:* Conor Dooley <mailto:[email protected]>
> *Date:* 2022-06-15 18:42
> *To:* heliang <mailto:[email protected]>; daniel <mailto:[email protected]>; haojian.zhuang <mailto:[email protected]>; robert.jarzmik <mailto:[email protected]>; linux <mailto:[email protected]>
> *CC:* linux-arm-kernel <mailto:[email protected]>; linux-kernel <mailto:[email protected]>
> *Subject:* Re: [PATCH] [Re-PATCH] arch: arm: mach-pxa: Add missing of_node_put in irq.c
> On 15/06/2022 11:33, heliang wrote:
> > [PATCH] [Re-PATCH] arch: arm: mach-pxa: Add missing of_node_put in irq.c
> You mean [PATCH v2]? Pass -v N arg to format-patch & it'll do it
> for you.
> > In pxa_dt_irq_init(), of_find_matching_node() will return a node
> > pointer with refcount incremented. We should use of_node_put in
> > fail path or when it is not used anymore. This goto-label patch
> > style is advised by Daniel.
> >
> > Signed-off-by: heliang <[email protected]>
> On all these patches, is "heliang" your (full) real name?
> See:
> https://www.kernel.org/doc/html/latest/process/submitting-patches.html#developer-s-certificate-of-origin-1-1
> > ---
> It's helpful to put a changelog here too for what changed since v1
> > arch/arm/mach-pxa/irq.c | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
> > index 96f33ef1d9ea..338356b9f37c 100644
> > --- a/arch/arm/mach-pxa/irq.c
> > +++ b/arch/arm/mach-pxa/irq.c
> > @@ -247,13 +247,13 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
> > &pxa_internal_irq_nr);
> > if (ret) {
> > pr_err("Not found marvell,intc-nr-irqs property\n");
> > - return;
> > + goto out_put;
> > }
> >
> > ret = of_address_to_resource(node, 0, &res);
> > if (ret < 0) {
> > pr_err("No registers defined for node\n");
> > - return;
> > + goto out_put;
> > }
> > pxa_irq_base = io_p2v(res.start);
> >
> > @@ -263,9 +263,12 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
> > ret = irq_alloc_descs(-1, 0, pxa_internal_irq_nr, 0);
> > if (ret < 0) {
> > pr_err("Failed to allocate IRQ numbers\n");
> > - return;
> > + goto out_put;
> > }
> >
> > pxa_init_irq_common(node, pxa_internal_irq_nr, fn);
> > +
> > +out_put:
> > + of_node_put(node);
> > }
> > #endif /* CONFIG_OF */
>