From: Thorsten Blum <blum@kernel.org>
To: Geoff Levand <geoff@infradead.org>,
Madhavan Srinivasan <maddy@linux.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>,
"Christophe Leroy (CS GROUP)" <chleroy@kernel.org>,
"Ritesh Harjani (IBM)" <ritesh.list@gmail.com>,
Shrikanth Hegde <sshegde@linux.ibm.com>
Cc: Thorsten Blum <blum@kernel.org>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH] powerpc/ps3: Simplify control flow in ps3_{virq,irq_plug}_setup()
Date: Mon, 14 Sep 2026 23:59:00 +0200 [thread overview]
Message-ID: <20260914215900.84712-2-blum@kernel.org> (raw)
In ps3_virq_setup() and ps3_irq_plug_setup(), remove the goto statements
and handle errors directly.
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
arch/powerpc/platforms/ps3/interrupt.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index a4ad4b49eef7..358611638258 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -184,8 +184,7 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
if (!*virq) {
FAIL("%s:%d: irq_create_mapping failed: outlet %lu\n",
__func__, __LINE__, outlet);
- result = -ENOMEM;
- goto fail_create;
+ return -ENOMEM;
}
DBG("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
@@ -196,17 +195,13 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
if (result) {
FAIL("%s:%d: irq_set_chip_data failed\n",
__func__, __LINE__);
- goto fail_set;
+ irq_dispose_mapping(*virq);
+ return result;
}
ps3_chip_mask(irq_get_irq_data(*virq));
return result;
-
-fail_set:
- irq_dispose_mapping(*virq);
-fail_create:
- return result;
}
/**
@@ -250,7 +245,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
if (result) {
FAIL("%s:%d: ps3_virq_setup failed\n", __func__, __LINE__);
- goto fail_setup;
+ return result;
}
pd = irq_get_chip_data(*virq);
@@ -263,16 +258,11 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
if (result) {
FAIL("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",
__func__, __LINE__, ps3_result(result));
- result = -EPERM;
- goto fail_connect;
+ ps3_virq_destroy(*virq);
+ return -EPERM;
}
return result;
-
-fail_connect:
- ps3_virq_destroy(*virq);
-fail_setup:
- return result;
}
EXPORT_SYMBOL_GPL(ps3_irq_plug_setup);
next reply other threads:[~2026-09-14 21:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 21:59 Thorsten Blum [this message]
2026-09-15 8:02 ` Geert Uytterhoeven
2026-09-15 18:22 ` Amit Machhiwal
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=20260914215900.84712-2-blum@kernel.org \
--to=blum@kernel.org \
--cc=chleroy@kernel.org \
--cc=geoff@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=ritesh.list@gmail.com \
--cc=sshegde@linux.ibm.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®