diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-06 14:18:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 17:51:14 -0500 |
commit | 4927b3f74c6a2fd92226dcf1542a598be9738808 (patch) | |
tree | aee712f33f32a6dc992434773fd0de41e335078e /drivers/scsi | |
parent | f9e9dcb38f5106fa8cdac04a9e967d5487f1cd20 (diff) |
[PATCH] More work_struct induced breakage (s390)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/oktagon_esp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index dd67a68c5c23..c116a6ae3c54 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c | |||
@@ -72,12 +72,12 @@ static void dma_advance_sg(Scsi_Cmnd *); | |||
72 | static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x); | 72 | static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x); |
73 | 73 | ||
74 | #ifdef USE_BOTTOM_HALF | 74 | #ifdef USE_BOTTOM_HALF |
75 | static void dma_commit(void *opaque); | 75 | static void dma_commit(struct work_struct *unused); |
76 | 76 | ||
77 | long oktag_to_io(long *paddr, long *addr, long len); | 77 | long oktag_to_io(long *paddr, long *addr, long len); |
78 | long oktag_from_io(long *addr, long *paddr, long len); | 78 | long oktag_from_io(long *addr, long *paddr, long len); |
79 | 79 | ||
80 | static DECLARE_WORK(tq_fake_dma, dma_commit, NULL); | 80 | static DECLARE_WORK(tq_fake_dma, dma_commit); |
81 | 81 | ||
82 | #define DMA_MAXTRANSFER 0x8000 | 82 | #define DMA_MAXTRANSFER 0x8000 |
83 | 83 | ||
@@ -266,7 +266,7 @@ oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x) | |||
266 | */ | 266 | */ |
267 | 267 | ||
268 | 268 | ||
269 | static void dma_commit(void *opaque) | 269 | static void dma_commit(struct work_struct *unused) |
270 | { | 270 | { |
271 | long wait,len2,pos; | 271 | long wait,len2,pos; |
272 | struct NCR_ESP *esp; | 272 | struct NCR_ESP *esp; |