diff options
Diffstat (limited to 'drivers/scsi/NCR5380.c')
-rw-r--r-- | drivers/scsi/NCR5380.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 616810ad17d8..a6aa91072880 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
@@ -558,8 +558,7 @@ static int probe_irq __initdata = 0; | |||
558 | * used by the IRQ probe code. | 558 | * used by the IRQ probe code. |
559 | */ | 559 | */ |
560 | 560 | ||
561 | static irqreturn_t __init probe_intr(int irq, void *dev_id, | 561 | static irqreturn_t __init probe_intr(int irq, void *dev_id) |
562 | struct pt_regs *regs) | ||
563 | { | 562 | { |
564 | probe_irq = irq; | 563 | probe_irq = irq; |
565 | return IRQ_HANDLED; | 564 | return IRQ_HANDLED; |
@@ -1148,7 +1147,6 @@ static void NCR5380_main(void *p) | |||
1148 | * NCR5380_intr - generic NCR5380 irq handler | 1147 | * NCR5380_intr - generic NCR5380 irq handler |
1149 | * @irq: interrupt number | 1148 | * @irq: interrupt number |
1150 | * @dev_id: device info | 1149 | * @dev_id: device info |
1151 | * @regs: registers (unused) | ||
1152 | * | 1150 | * |
1153 | * Handle interrupts, reestablishing I_T_L or I_T_L_Q nexuses | 1151 | * Handle interrupts, reestablishing I_T_L or I_T_L_Q nexuses |
1154 | * from the disconnected queue, and restarting NCR5380_main() | 1152 | * from the disconnected queue, and restarting NCR5380_main() |
@@ -1157,7 +1155,7 @@ static void NCR5380_main(void *p) | |||
1157 | * Locks: takes the needed instance locks | 1155 | * Locks: takes the needed instance locks |
1158 | */ | 1156 | */ |
1159 | 1157 | ||
1160 | static irqreturn_t NCR5380_intr(int irq, void *dev_id, struct pt_regs *regs) | 1158 | static irqreturn_t NCR5380_intr(int irq, void *dev_id) |
1161 | { | 1159 | { |
1162 | NCR5380_local_declare(); | 1160 | NCR5380_local_declare(); |
1163 | struct Scsi_Host *instance = (struct Scsi_Host *)dev_id; | 1161 | struct Scsi_Host *instance = (struct Scsi_Host *)dev_id; |