diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/scsi/atari_scsi.c | |
parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/atari_scsi.c')
-rw-r--r-- | drivers/scsi/atari_scsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index e1be4a4387cd..dfb1bcfae82e 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c | |||
@@ -194,8 +194,8 @@ static int falcon_classify_cmd( Scsi_Cmnd *cmd ); | |||
194 | static unsigned long atari_dma_xfer_len( unsigned long wanted_len, | 194 | static unsigned long atari_dma_xfer_len( unsigned long wanted_len, |
195 | Scsi_Cmnd *cmd, int write_flag ); | 195 | Scsi_Cmnd *cmd, int write_flag ); |
196 | #endif | 196 | #endif |
197 | static irqreturn_t scsi_tt_intr( int irq, void *dummy, struct pt_regs *fp); | 197 | static irqreturn_t scsi_tt_intr( int irq, void *dummy); |
198 | static irqreturn_t scsi_falcon_intr( int irq, void *dummy, struct pt_regs *fp); | 198 | static irqreturn_t scsi_falcon_intr( int irq, void *dummy); |
199 | static void falcon_release_lock_if_possible( struct NCR5380_hostdata * | 199 | static void falcon_release_lock_if_possible( struct NCR5380_hostdata * |
200 | hostdata ); | 200 | hostdata ); |
201 | static void falcon_get_lock( void ); | 201 | static void falcon_get_lock( void ); |
@@ -285,7 +285,7 @@ static int scsi_dma_is_ignored_buserr( unsigned char dma_stat ) | |||
285 | * end-of-DMA, both SCSI ints are triggered simultaneously, so the NCR int has | 285 | * end-of-DMA, both SCSI ints are triggered simultaneously, so the NCR int has |
286 | * to clear the DMA int pending bit before it allows other level 6 interrupts. | 286 | * to clear the DMA int pending bit before it allows other level 6 interrupts. |
287 | */ | 287 | */ |
288 | static void scsi_dma_buserr (int irq, void *dummy, struct pt_regs *fp) | 288 | static void scsi_dma_buserr (int irq, void *dummy) |
289 | { | 289 | { |
290 | unsigned char dma_stat = tt_scsi_dma.dma_ctrl; | 290 | unsigned char dma_stat = tt_scsi_dma.dma_ctrl; |
291 | 291 | ||
@@ -314,7 +314,7 @@ static void scsi_dma_buserr (int irq, void *dummy, struct pt_regs *fp) | |||
314 | #endif | 314 | #endif |
315 | 315 | ||
316 | 316 | ||
317 | static irqreturn_t scsi_tt_intr (int irq, void *dummy, struct pt_regs *fp) | 317 | static irqreturn_t scsi_tt_intr (int irq, void *dummy) |
318 | { | 318 | { |
319 | #ifdef REAL_DMA | 319 | #ifdef REAL_DMA |
320 | int dma_stat; | 320 | int dma_stat; |
@@ -406,7 +406,7 @@ static irqreturn_t scsi_tt_intr (int irq, void *dummy, struct pt_regs *fp) | |||
406 | } | 406 | } |
407 | 407 | ||
408 | 408 | ||
409 | static irqreturn_t scsi_falcon_intr (int irq, void *dummy, struct pt_regs *fp) | 409 | static irqreturn_t scsi_falcon_intr (int irq, void *dummy) |
410 | { | 410 | { |
411 | #ifdef REAL_DMA | 411 | #ifdef REAL_DMA |
412 | int dma_stat; | 412 | int dma_stat; |