1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 151e1ad8fe9f..a2b70fb4c67f 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -312,7 +312,7 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
                         if (pnp_irq_valid(dev, 0))
                                 overrides[count].irq = pnp_irq(dev, 0);
                         else
-                                overrides[count].irq = SCSI_IRQ_NONE;
+                                overrides[count].irq = NO_IRQ;
                         if (pnp_dma_valid(dev, 0))
                                 overrides[count].dma = pnp_dma(dev, 0);
                         else
@@ -432,20 +432,24 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
                 else
                         instance->irq = NCR5380_probe_irq(instance, 0xffff);
 
-                if (instance->irq != SCSI_IRQ_NONE)
+                /* Compatibility with documented NCR5380 kernel parameters */
+                if (instance->irq == 255)
+                        instance->irq = NO_IRQ;
+
+                if (instance->irq != NO_IRQ)
                         if (request_irq(instance->irq, generic_NCR5380_intr,
                                         0, "NCR5380", instance)) {
                                 printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
-                                instance->irq = SCSI_IRQ_NONE;
+                                instance->irq = NO_IRQ;
                         }
 
-                if (instance->irq == SCSI_IRQ_NONE) {
+                if (instance->irq == NO_IRQ) {
                         printk(KERN_INFO "scsi%d : interrupts not enabled. for better interactive performance,\n", instance->host_no);
                         printk(KERN_INFO "scsi%d : please jumper the board for a free IRQ.\n", instance->host_no);
                 }
 
                 printk(KERN_INFO "scsi%d : at " STRVAL(NCR5380_map_name) " 0x%x", instance->host_no, (unsigned int) instance->NCR5380_instance_name);
-                if (instance->irq == SCSI_IRQ_NONE)
+                if (instance->irq == NO_IRQ)
                         printk(" interrupts disabled");
                 else
                         printk(" irq %d", instance->irq);
@@ -486,7 +490,7 @@ static int generic_NCR5380_release_resources(struct Scsi_Host *instance)
         NCR5380_local_declare();
         NCR5380_setup(instance);
         
-        if (instance->irq != SCSI_IRQ_NONE)
+        if (instance->irq != NO_IRQ)
                 free_irq(instance->irq, instance);
         NCR5380_exit(instance);
 
@@ -796,7 +800,7 @@ static int generic_NCR5380_show_info(struct seq_file *m, struct Scsi_Host *scsi_
         PRINTP("NO NCR53C400 driver extensions\n");
 #endif
         PRINTP("Using %s mapping at %s 0x%lx, " ANDP STRVAL(NCR5380_map_config) ANDP STRVAL(NCR5380_map_name) ANDP scsi_ptr->NCR5380_instance_name);
-        if (scsi_ptr->irq == SCSI_IRQ_NONE)
+        if (scsi_ptr->irq == NO_IRQ)
                 PRINTP("no interrupt\n");
         else
                 PRINTP("on interrupt %d\n" ANDP scsi_ptr->irq);