linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / wd33c93.c

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 2083454..fb53eea 100644 (file)
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -71,14 +71,15 @@
  *     Richard Hirst <richard@sleepie.demon.co.uk>  August 2000
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/blkdev.h>
+#include <asm/irq.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -373,7 +374,7 @@ wd33c93_queuecommand(struct scsi_cmnd *cmd,
  */
 
        if (cmd->use_sg) {
-               cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
+               cmd->SCp.buffer = (struct scatterlist *) cmd->buffer;
                cmd->SCp.buffers_residual = cmd->use_sg - 1;
                cmd->SCp.ptr = page_address(cmd->SCp.buffer->page) +
                    cmd->SCp.buffer->offset;
@@ -938,7 +939,6 @@ wd33c93_intr(struct Scsi_Host *instance)
                DB(DB_INTR, printk("%02x", cmd->SCp.Status))
                    if (hostdata->level2 >= L2_BASIC) {
                        sr = read_wd33c93(regs, WD_SCSI_STATUS);        /* clear interrupt */
-                       udelay(7);
                        hostdata->state = S_RUNNING_LEVEL2;
                        write_wd33c93(regs, WD_COMMAND_PHASE, 0x50);
                        write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
@@ -955,7 +955,6 @@ wd33c93_intr(struct Scsi_Host *instance)
 
                msg = read_1_byte(regs);
                sr = read_wd33c93(regs, WD_SCSI_STATUS);        /* clear interrupt */
-               udelay(7);
 
                hostdata->incoming_msg[hostdata->incoming_ptr] = msg;
                if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE)
@@ -1359,7 +1358,6 @@ wd33c93_intr(struct Scsi_Host *instance)
                        } else {
                                /* Verify this is a change to MSG_IN and read the message */
                                sr = read_wd33c93(regs, WD_SCSI_STATUS);
-                               udelay(7);
                                if (sr == (CSR_ABORT | PHS_MESS_IN) ||
                                    sr == (CSR_UNEXP | PHS_MESS_IN) ||
                                    sr == (CSR_SRV_REQ | PHS_MESS_IN)) {
@@ -1376,7 +1374,6 @@ wd33c93_intr(struct Scsi_Host *instance)
                                                             asr);
                                        }
                                        sr = read_wd33c93(regs, WD_SCSI_STATUS);
-                                       udelay(7);
                                        if (sr != CSR_MSGIN)
                                                printk
                                                    ("wd33c93: Not paused with ACK on RESEL (%02x)\n",
@@ -1704,7 +1701,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)
 }
 
 #define MAX_WD33C93_HOSTS 4
-#define MAX_SETUP_ARGS ARRAY_SIZE(setup_args)
+#define MAX_SETUP_ARGS ((int)(sizeof(setup_args) / sizeof(char *)))
 #define SETUP_BUFFER_SIZE 200
 static char setup_buffer[SETUP_BUFFER_SIZE];
 static char setup_used[MAX_SETUP_ARGS];