From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Liang He <windhl@126.com>, "oss@buserror.net" <oss@buserror.net>,
"mpe@ellerman.id.au" <mpe@ellerman.id.au>,
"benh@kernel.crashing.org" <benh@kernel.crashing.org>,
"paulus@samba.org" <paulus@samba.org>
Cc: "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] arch: powerpc: platforms: 85xx: Add missing of_node_put in sgy_cts1000.c
Date: Thu, 16 Jun 2022 14:49:36 +0000 [thread overview]
Message-ID: <db681dac-5c42-d659-d0ed-31390b2feb3a@csgroup.eu> (raw)
In-Reply-To: <20220615120717.3965164-1-windhl@126.com>
Le 15/06/2022 à 14:07, Liang He a écrit :
> [You don't often get email from windhl@126.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> Signed-off-by: Liang He <windhl@126.com>
> ---
> arch/powerpc/platforms/85xx/sgy_cts1000.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
> index 98ae64075193..2a45b30852b2 100644
> --- a/arch/powerpc/platforms/85xx/sgy_cts1000.c
> +++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
> @@ -85,17 +85,24 @@ static int gpio_halt_probe(struct platform_device *pdev)
> /* Technically we could just read the first one, but punish
> * DT writers for invalid form. */
> if (of_gpio_count(halt_node) != 1)
> + {
> + of_node_put(halt_node);
Duplicating the same code at multiple exit points is bad practice.
If you can't do a simple 'return' exit, you should use 'goto' to a
common error path exit.
> return -EINVAL;
> + }
>
> /* Get the gpio number relative to the dynamic base. */
> gpio = of_get_gpio_flags(halt_node, 0, &flags);
> if (!gpio_is_valid(gpio))
> + {
> + of_node_put(halt_node);
> return -EINVAL;
> + }
>
> err = gpio_request(gpio, "gpio-halt");
> if (err) {
> printk(KERN_ERR "gpio-halt: error requesting GPIO %d.\n",
> gpio);
> + of_node_put(halt_node);
> halt_node = NULL;
> return err;
> }
> @@ -112,6 +119,7 @@ static int gpio_halt_probe(struct platform_device *pdev)
> printk(KERN_ERR "gpio-halt: error requesting IRQ %d for "
> "GPIO %d.\n", irq, gpio);
> gpio_free(gpio);
> + of_node_put(halt_node);
> halt_node = NULL;
> return err;
> }
> @@ -123,6 +131,8 @@ static int gpio_halt_probe(struct platform_device *pdev)
> printk(KERN_INFO "gpio-halt: registered GPIO %d (%d trigger, %d"
> " irq).\n", gpio, trigger, irq);
>
> + of_node_put(halt_node);
> +
> return 0;
> }
>
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-06-16 14:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 12:07 Liang He
2022-06-16 14:49 ` Christophe Leroy [this message]
2022-06-16 14:56 ` Liang He
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=db681dac-5c42-d659-d0ed-31390b2feb3a@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=oss@buserror.net \
--cc=paulus@samba.org \
--cc=windhl@126.com \
/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
all inboxes | Powered by JetHome®