From: Valentin Ilie <valentin.ilie@gmail.com>
To: linux@arm.linux.org.uk
Cc: swarren@nvidia.com, rmk+kernel@arm.linux.org.uk,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Valentin Ilie <valentin.ilie@gmail.com>
Subject: [PATCH] ARM: mach-iop32x: iq31244: Replace if-then-else with a switch statement
Date: Mon, 2 Sep 2013 18:23:14 +0300 [thread overview]
Message-ID: <1378135394-31092-1-git-send-email-valentin.ilie@gmail.com> (raw)
Convert a compound if-else blob to a switch statement.
Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
---
arch/arm/mach-iop32x/iq31244.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c
index f2cd296..3415f11 100644
--- a/arch/arm/mach-iop32x/iq31244.c
+++ b/arch/arm/mach-iop32x/iq31244.c
@@ -101,28 +101,21 @@ void __init iq31244_map_io(void)
static int __init
ep80219_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
- int irq;
-
- if (slot == 0) {
- /* CFlash */
- irq = IRQ_IOP32X_XINT1;
- } else if (slot == 1) {
- /* 82551 Pro 100 */
- irq = IRQ_IOP32X_XINT0;
- } else if (slot == 2) {
- /* PCI-X Slot */
- irq = IRQ_IOP32X_XINT3;
- } else if (slot == 3) {
- /* SATA */
- irq = IRQ_IOP32X_XINT2;
- } else {
+ switch (slot) {
+ case 0: /* CFlash */
+ return IRQ_IOP32X_XINT1;
+ case 1: /* 82551 Pro 100 */
+ return IRQ_IOP32X_XINT0;
+ case 2: /* PCI-X Slot */
+ return IRQ_IOP32X_XINT3;
+ case 3: /* SATA */
+ return IRQ_IOP32X_XINT2;
+ default:
printk(KERN_ERR "ep80219_pci_map_irq() called for unknown "
"device PCI:%d:%d:%d\n", dev->bus->number,
PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
- irq = -1;
+ return -1;
}
-
- return irq;
}
static struct hw_pci ep80219_pci __initdata = {
--
1.8.1.2
next reply other threads:[~2013-09-02 15:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 15:23 Valentin Ilie [this message]
2013-09-29 15:19 ` Valentin Ilie
2013-10-02 20:23 ` Russell King - ARM Linux
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=1378135394-31092-1-git-send-email-valentin.ilie@gmail.com \
--to=valentin.ilie@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=swarren@nvidia.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®