aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-rpc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-18 10:41:44 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-24 05:37:37 -0400
commit41569e370c5e1f5714a3386a3795efff99891f97 (patch)
tree2f6aecc8df5de80211c6aa754727637c5f1747b8 /arch/arm/mach-rpc
parent2b7da084d484fe0dd831464993e2abb496402eb8 (diff)
ARM: ecard: get rid of NO_IRQ madness
Get rid of the NO_IRQ madness from Acorn expansion card handling code. Thankfully, are relatively few users of this here, and so it's easy to audit. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-rpc')
-rw-r--r--arch/arm/mach-rpc/ecard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index f7ee875b2f37..0c01567007c8 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -560,7 +560,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc)
560 for (ec = cards; ec; ec = ec->next) { 560 for (ec = cards; ec; ec = ec->next) {
561 int pending; 561 int pending;
562 562
563 if (!ec->claimed || ec->irq == NO_IRQ || ec->slot_no == 8) 563 if (!ec->claimed || !ec->irq || ec->slot_no == 8)
564 continue; 564 continue;
565 565
566 if (ec->ops && ec->ops->irqpending) 566 if (ec->ops && ec->ops->irqpending)
@@ -710,8 +710,8 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
710 710
711 ec->slot_no = slot; 711 ec->slot_no = slot;
712 ec->easi = type == ECARD_EASI; 712 ec->easi = type == ECARD_EASI;
713 ec->irq = NO_IRQ; 713 ec->irq = 0;
714 ec->fiq = NO_IRQ; 714 ec->fiq = 0;
715 ec->dma = NO_DMA; 715 ec->dma = NO_DMA;
716 ec->ops = &ecard_default_ops; 716 ec->ops = &ecard_default_ops;
717 717