ARM: ecard: get rid of NO_IRQ madness
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 18 Jan 2012 15:41:44 +0000 (15:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 24 Mar 2012 09:37:37 +0000 (09:37 +0000)
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>
arch/arm/mach-rpc/ecard.c
drivers/scsi/arm/arxescsi.c
drivers/scsi/arm/fas216.c
drivers/scsi/arm/fas216.h

index f7ee875b2f377d2320f8c3b936daed5b615df2f2..0c01567007c87cbcc3f25904f8b63ad827271d55 100644 (file)
@@ -560,7 +560,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc)
        for (ec = cards; ec; ec = ec->next) {
                int pending;
 
        for (ec = cards; ec; ec = ec->next) {
                int pending;
 
-               if (!ec->claimed || ec->irq == NO_IRQ || ec->slot_no == 8)
+               if (!ec->claimed || !ec->irq || ec->slot_no == 8)
                        continue;
 
                if (ec->ops && ec->ops->irqpending)
                        continue;
 
                if (ec->ops && ec->ops->irqpending)
@@ -710,8 +710,8 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
 
        ec->slot_no = slot;
        ec->easi = type == ECARD_EASI;
 
        ec->slot_no = slot;
        ec->easi = type == ECARD_EASI;
-       ec->irq = NO_IRQ;
-       ec->fiq = NO_IRQ;
+       ec->irq = 0;
+       ec->fiq = 0;
        ec->dma = NO_DMA;
        ec->ops = &ecard_default_ops;
 
        ec->dma = NO_DMA;
        ec->ops = &ecard_default_ops;
 
index a750aa72b8ef27249a8925e49feee8cf5baf1811..2a28b4ad1975b8f66bb846f41f5928bfdaf880d3 100644 (file)
@@ -305,7 +305,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
        info->base = base;
 
        info->info.scsi.io_base         = base + 0x2000;
        info->base = base;
 
        info->info.scsi.io_base         = base + 0x2000;
-       info->info.scsi.irq             = NO_IRQ;
+       info->info.scsi.irq             = 0;
        info->info.scsi.dma             = NO_DMA;
        info->info.scsi.io_shift        = 5;
        info->info.ifcfg.clockrate      = 24; /* MHz */
        info->info.scsi.dma             = NO_DMA;
        info->info.scsi.io_shift        = 5;
        info->info.ifcfg.clockrate      = 24; /* MHz */
index e85c40b6e19b162bdff9a20c203af426b746cf41..6206a666a8ec6d76a5ecba29f5069d77be339b61 100644 (file)
@@ -2176,7 +2176,7 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
        fn = (void (*)(FAS216_Info *, struct scsi_cmnd *, unsigned int))SCpnt->host_scribble;
        fn(info, SCpnt, result);
 
        fn = (void (*)(FAS216_Info *, struct scsi_cmnd *, unsigned int))SCpnt->host_scribble;
        fn(info, SCpnt, result);
 
-       if (info->scsi.irq != NO_IRQ) {
+       if (info->scsi.irq) {
                spin_lock_irqsave(&info->host_lock, flags);
                if (info->scsi.phase == PHASE_IDLE)
                        fas216_kick(info);
                spin_lock_irqsave(&info->host_lock, flags);
                if (info->scsi.phase == PHASE_IDLE)
                        fas216_kick(info);
@@ -2276,7 +2276,7 @@ static int fas216_noqueue_command_lck(struct scsi_cmnd *SCpnt,
         * We should only be using this if we don't have an interrupt.
         * Provide some "incentive" to use the queueing code.
         */
         * We should only be using this if we don't have an interrupt.
         * Provide some "incentive" to use the queueing code.
         */
-       BUG_ON(info->scsi.irq != NO_IRQ);
+       BUG_ON(info->scsi.irq);
 
        info->internal_done = 0;
        fas216_queue_command_lck(SCpnt, fas216_internal_done);
 
        info->internal_done = 0;
        fas216_queue_command_lck(SCpnt, fas216_internal_done);
index 84b7127c01212409a97f793d6f87a8bdb0a17c80..df2e1b3ddfe230da9aef38355d7a3014cd8c7e0e 100644 (file)
 #ifndef FAS216_H
 #define FAS216_H
 
 #ifndef FAS216_H
 #define FAS216_H
 
-#ifndef NO_IRQ
-#define NO_IRQ 255
-#endif
-
 #include <scsi/scsi_eh.h>
 
 #include "queue.h"
 #include <scsi/scsi_eh.h>
 
 #include "queue.h"