diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2007-05-01 16:32:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:59:06 -0400 |
commit | b312b38c7411d4a2fff3fcdff13556b090f80f25 (patch) | |
tree | 7e1b1ece0a7ca1dca3d539b5cedd8998083a6609 | |
parent | 35bdd52d7401b1208552523d6fa28d4a37dbc74d (diff) |
m68k: Atari SCSI workqueue updates
Workqueue updates for the Atari SCSI driver
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/scsi/atari_NCR5380.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index c912733ac077..eff846ae0aff 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c | |||
@@ -657,7 +657,7 @@ static inline void NCR5380_print_phase(struct Scsi_Host *instance) | |||
657 | #include <linux/interrupt.h> | 657 | #include <linux/interrupt.h> |
658 | 658 | ||
659 | static volatile int main_running; | 659 | static volatile int main_running; |
660 | static DECLARE_WORK(NCR5380_tqueue, (void (*)(void *))NCR5380_main, NULL); | 660 | static DECLARE_WORK(NCR5380_tqueue, NCR5380_main); |
661 | 661 | ||
662 | static inline void queue_main(void) | 662 | static inline void queue_main(void) |
663 | { | 663 | { |
@@ -1075,7 +1075,7 @@ static int NCR5380_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) | |||
1075 | * reenable them. This prevents reentrancy and kernel stack overflow. | 1075 | * reenable them. This prevents reentrancy and kernel stack overflow. |
1076 | */ | 1076 | */ |
1077 | 1077 | ||
1078 | static void NCR5380_main(void *bl) | 1078 | static void NCR5380_main(struct work_struct *work) |
1079 | { | 1079 | { |
1080 | Scsi_Cmnd *tmp, *prev; | 1080 | Scsi_Cmnd *tmp, *prev; |
1081 | struct Scsi_Host *instance = first_instance; | 1081 | struct Scsi_Host *instance = first_instance; |