From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 1 May 2007 20:32:48 +0000 (+0200)
Subject: m68k: Atari SCSI workqueue updates
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b312b38c7411d4a2fff3fcdff13556b090f80f25;p=linux-beck.git

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>
---

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)
 #include <linux/interrupt.h>
 
 static volatile int main_running;
-static DECLARE_WORK(NCR5380_tqueue, (void (*)(void *))NCR5380_main, NULL);
+static DECLARE_WORK(NCR5380_tqueue, NCR5380_main);
 
 static inline void queue_main(void)
 {
@@ -1075,7 +1075,7 @@ static int NCR5380_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
  *  reenable them.  This prevents reentrancy and kernel stack overflow.
  */
 
-static void NCR5380_main(void *bl)
+static void NCR5380_main(struct work_struct *work)
 {
 	Scsi_Cmnd *tmp, *prev;
 	struct Scsi_Host *instance = first_instance;