diff options
| author | Finn Thain | 2016-03-23 11:10:27 +0100 |
|---|---|---|
| committer | Martin K. Petersen | 2016-04-11 22:57:09 +0200 |
| commit | a46865dcf1f7166808664ab096678f81d4fbb853 (patch) | |
| tree | 4345cdb85a0988765ca12b181e69ce9317e4658a /drivers/scsi/dtc.c | |
| parent | ncr5380: Remove remaining register storage qualifiers (diff) | |
| download | kernel-qcow2-linux-a46865dcf1f7166808664ab096678f81d4fbb853.tar.gz kernel-qcow2-linux-a46865dcf1f7166808664ab096678f81d4fbb853.tar.xz kernel-qcow2-linux-a46865dcf1f7166808664ab096678f81d4fbb853.zip | |
ncr5380: Remove DONT_USE_INTR and AUTOPROBE_IRQ macros
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/dtc.c')
| -rw-r--r-- | drivers/scsi/dtc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index e87c632234f3..459863f94e46 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -1,5 +1,3 @@ -#define DONT_USE_INTR - /* * DTC 3180/3280 driver, by * Ray Van Tassle rayvt@comm.mot.com @@ -53,7 +51,6 @@ #include <scsi/scsi_host.h> #include "dtc.h" -#define AUTOPROBE_IRQ #include "NCR5380.h" /* @@ -243,9 +240,10 @@ found: if (instance->irq == 255) instance->irq = NO_IRQ; -#ifndef DONT_USE_INTR /* With interrupts enabled, it will sometimes hang when doing heavy * reads. So better not enable them until I finger it out. */ + instance->irq = NO_IRQ; + if (instance->irq != NO_IRQ) if (request_irq(instance->irq, dtc_intr, 0, "dtc", instance)) { @@ -257,11 +255,7 @@ found: printk(KERN_WARNING "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no); printk(KERN_WARNING "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no); } -#else - if (instance->irq != NO_IRQ) - printk(KERN_WARNING "scsi%d : interrupts not used. Might as well not jumper it.\n", instance->host_no); - instance->irq = NO_IRQ; -#endif + dprintk(NDEBUG_INIT, "scsi%d : irq = %d\n", instance->host_no, instance->irq); |