linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 59a4097..34daa3e 100644 (file)
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -370,7 +370,7 @@ static int in2000_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
  */
 
        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 = (char *) page_address(cmd->SCp.buffer->page) + cmd->SCp.buffer->offset;
                cmd->SCp.this_residual = cmd->SCp.buffer->length;
@@ -1809,7 +1809,7 @@ static int in2000_abort(Scsi_Cmnd * cmd)
 
 
 #define MAX_IN2000_HOSTS 3
-#define MAX_SETUP_ARGS ARRAY_SIZE(setup_args)
+#define MAX_SETUP_ARGS (sizeof(setup_args) / sizeof(char *))
 #define SETUP_BUFFER_SIZE 200
 static char setup_buffer[SETUP_BUFFER_SIZE];
 static char setup_used[MAX_SETUP_ARGS];
@@ -1898,21 +1898,6 @@ static int int_tab[] in2000__INITDATA = {
        10
 };
 
-static int probe_bios(u32 addr, u32 *s1, uchar *switches)
-{
-       void __iomem *p = ioremap(addr, 0x34);
-       if (!p)
-               return 0;
-       *s1 = readl(p + 0x10);
-       if (*s1 == 0x41564f4e || readl(p + 0x30) == 0x61776c41) {
-               /* Read the switch image that's mapped into EPROM space */
-               *switches = ~readb(p + 0x20);
-               iounmap(p);
-               return 1;
-       }
-       iounmap(p);
-       return 0;
-}
 
 static int __init in2000_detect(struct scsi_host_template * tpnt)
 {
@@ -1945,7 +1930,6 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)
 
        detect_count = 0;
        for (bios = 0; bios_tab[bios]; bios++) {
-               u32 s1 = 0;
                if (check_setup_args("ioport", &val, buf)) {
                        base = val;
                        switches = ~inb(base + IO_SWITCHES) & 0xff;
@@ -1957,9 +1941,13 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)
  * for the obvious ID strings. We look for the 2 most common ones and
  * hope that they cover all the cases...
  */
-               else if (probe_bios(bios_tab[bios], &s1, &switches)) {
+               else if (isa_readl(bios_tab[bios] + 0x10) == 0x41564f4e || isa_readl(bios_tab[bios] + 0x30) == 0x61776c41) {
                        printk("Found IN2000 BIOS at 0x%x ", (unsigned int) bios_tab[bios]);
 
+/* Read the switch image that's mapped into EPROM space */
+
+                       switches = ~((isa_readb(bios_tab[bios] + 0x20) & 0xff));
+
 /* Find out where the IO space is */
 
                        x = switches & (SW_ADDR0 | SW_ADDR1);
@@ -2015,7 +2003,7 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)
                write1_io(0, IO_FIFO_READ);     /* start fifo out in read mode */
                write1_io(0, IO_INTR_MASK);     /* allow all ints */
                x = int_tab[(switches & (SW_INT0 | SW_INT1)) >> SW_INT_SHIFT];
-               if (request_irq(x, in2000_intr, IRQF_DISABLED, "in2000", instance)) {
+               if (request_irq(x, in2000_intr, SA_INTERRUPT, "in2000", instance)) {
                        printk("in2000_detect: Unable to allocate IRQ.\n");
                        detect_count--;
                        continue;
@@ -2049,7 +2037,7 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)
 
 /* Older BIOS's had a 'sync on/off' switch - use its setting */
 
-               if (s1 == 0x41564f4e && (switches & SW_SYNC_DOS5))
+               if (isa_readl(bios_tab[bios] + 0x10) == 0x41564f4e && (switches & SW_SYNC_DOS5))
                        hostdata->sync_off = 0x00;      /* sync defaults to on */
                else
                        hostdata->sync_off = 0xff;      /* sync defaults to off */