1 files changed, 157 insertions, 152 deletions

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index d8fe5b76fee0..308541ff85cf 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -19,186 +19,190 @@
 #include "wd33c93.h"
 #include "a2091.h"
 
-#include<linux/stat.h>
+#include <linux/stat.h>
 
-#define DMA(ptr) ((a2091_scsiregs *)((ptr)->base))
-#define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
 
 static int a2091_release(struct Scsi_Host *instance);
 
-static irqreturn_t a2091_intr (int irq, void *_instance)
+static irqreturn_t a2091_intr(int irq, void *data)
 {
-    unsigned long flags;
-    unsigned int status;
-    struct Scsi_Host *instance = (struct Scsi_Host *)_instance;
-
-    status = DMA(instance)->ISTR;
-    if (!(status & (ISTR_INT_F|ISTR_INT_P)) || !(status & ISTR_INTS))
-        return IRQ_NONE;
-
-    spin_lock_irqsave(instance->host_lock, flags);
-    wd33c93_intr(instance);
-    spin_unlock_irqrestore(instance->host_lock, flags);
-    return IRQ_HANDLED;
+        struct Scsi_Host *instance = data;
+        a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+        unsigned int status = regs->ISTR;
+        unsigned long flags;
+
+        if (!(status & (ISTR_INT_F | ISTR_INT_P)) || !(status & ISTR_INTS))
+                return IRQ_NONE;
+
+        spin_lock_irqsave(instance->host_lock, flags);
+        wd33c93_intr(instance);
+        spin_unlock_irqrestore(instance->host_lock, flags);
+        return IRQ_HANDLED;
 }
 
 static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
 {
-    unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
-    unsigned long addr = virt_to_bus(cmd->SCp.ptr);
-    struct Scsi_Host *instance = cmd->device->host;
-
-    /* don't allow DMA if the physical address is bad */
-    if (addr & A2091_XFER_MASK)
-    {
-        HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511)
-            & ~0x1ff;
-        HDATA(instance)->dma_bounce_buffer =
-            kmalloc (HDATA(instance)->dma_bounce_len, GFP_KERNEL);
-        
-        /* can't allocate memory; use PIO */
-        if (!HDATA(instance)->dma_bounce_buffer) {
-            HDATA(instance)->dma_bounce_len = 0;
-            return 1;
-        }
-
-        /* get the physical address of the bounce buffer */
-        addr = virt_to_bus(HDATA(instance)->dma_bounce_buffer);
+        struct Scsi_Host *instance = cmd->device->host;
+        struct WD33C93_hostdata *hdata = shost_priv(instance);
+        a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+        unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
+        unsigned long addr = virt_to_bus(cmd->SCp.ptr);
 
-        /* the bounce buffer may not be in the first 16M of physmem */
+        /* don't allow DMA if the physical address is bad */
         if (addr & A2091_XFER_MASK) {
-            /* we could use chipmem... maybe later */
-            kfree (HDATA(instance)->dma_bounce_buffer);
-            HDATA(instance)->dma_bounce_buffer = NULL;
-            HDATA(instance)->dma_bounce_len = 0;
-            return 1;
+                hdata->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff;
+                hdata->dma_bounce_buffer = kmalloc(hdata->dma_bounce_len,
+                                                   GFP_KERNEL);
+
+                /* can't allocate memory; use PIO */
+                if (!hdata->dma_bounce_buffer) {
+                        hdata->dma_bounce_len = 0;
+                        return 1;
+                }
+
+                /* get the physical address of the bounce buffer */
+                addr = virt_to_bus(hdata->dma_bounce_buffer);
+
+                /* the bounce buffer may not be in the first 16M of physmem */
+                if (addr & A2091_XFER_MASK) {
+                        /* we could use chipmem... maybe later */
+                        kfree(hdata->dma_bounce_buffer);
+                        hdata->dma_bounce_buffer = NULL;
+                        hdata->dma_bounce_len = 0;
+                        return 1;
+                }
+
+                if (!dir_in) {
+                        /* copy to bounce buffer for a write */
+                        memcpy(hdata->dma_bounce_buffer, cmd->SCp.ptr,
+                               cmd->SCp.this_residual);
+                }
         }
 
-        if (!dir_in) {
-                /* copy to bounce buffer for a write */
-                memcpy (HDATA(instance)->dma_bounce_buffer,
-                        cmd->SCp.ptr, cmd->SCp.this_residual);
-        }
-    }
+        /* setup dma direction */
+        if (!dir_in)
+                cntr |= CNTR_DDIR;
 
-    /* setup dma direction */
-    if (!dir_in)
-        cntr |= CNTR_DDIR;
+        /* remember direction */
+        hdata->dma_dir = dir_in;
 
-    /* remember direction */
-    HDATA(cmd->device->host)->dma_dir = dir_in;
+        regs->CNTR = cntr;
 
-    DMA(cmd->device->host)->CNTR = cntr;
+        /* setup DMA *physical* address */
+        regs->ACR = addr;
 
-    /* setup DMA *physical* address */
-    DMA(cmd->device->host)->ACR = addr;
-
-    if (dir_in){
-        /* invalidate any cache */
-        cache_clear (addr, cmd->SCp.this_residual);
-    }else{
-        /* push any dirty cache */
-        cache_push (addr, cmd->SCp.this_residual);
-      }
-    /* start DMA */
-    DMA(cmd->device->host)->ST_DMA = 1;
+        if (dir_in) {
+                /* invalidate any cache */
+                cache_clear(addr, cmd->SCp.this_residual);
+        } else {
+                /* push any dirty cache */
+                cache_push(addr, cmd->SCp.this_residual);
+        }
+        /* start DMA */
+        regs->ST_DMA = 1;
 
-    /* return success */
-    return 0;
+        /* return success */
+        return 0;
 }
 
 static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
-                      int status)
+                     int status)
 {
-    /* disable SCSI interrupts */
-    unsigned short cntr = CNTR_PDMD;
-
-    if (!HDATA(instance)->dma_dir)
-            cntr |= CNTR_DDIR;
-
-    /* disable SCSI interrupts */
-    DMA(instance)->CNTR = cntr;
-
-    /* flush if we were reading */
-    if (HDATA(instance)->dma_dir) {
-        DMA(instance)->FLUSH = 1;
-        while (!(DMA(instance)->ISTR & ISTR_FE_FLG))
-            ;
-    }
-
-    /* clear a possible interrupt */
-    DMA(instance)->CINT = 1;
-
-    /* stop DMA */
-    DMA(instance)->SP_DMA = 1;
-
-    /* restore the CONTROL bits (minus the direction flag) */
-    DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN;
-
-    /* copy from a bounce buffer, if necessary */
-    if (status && HDATA(instance)->dma_bounce_buffer) {
-        if( HDATA(instance)->dma_dir )
-                memcpy (SCpnt->SCp.ptr, 
-                        HDATA(instance)->dma_bounce_buffer,
-                        SCpnt->SCp.this_residual);
-        kfree (HDATA(instance)->dma_bounce_buffer);
-        HDATA(instance)->dma_bounce_buffer = NULL;
-        HDATA(instance)->dma_bounce_len = 0;
-    }
+        struct WD33C93_hostdata *hdata = shost_priv(instance);
+        a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+
+        /* disable SCSI interrupts */
+        unsigned short cntr = CNTR_PDMD;
+
+        if (!hdata->dma_dir)
+                cntr |= CNTR_DDIR;
+
+        /* disable SCSI interrupts */
+        regs->CNTR = cntr;
+
+        /* flush if we were reading */
+        if (hdata->dma_dir) {
+                regs->FLUSH = 1;
+                while (!(regs->ISTR & ISTR_FE_FLG))
+                        ;
+        }
+
+        /* clear a possible interrupt */
+        regs->CINT = 1;
+
+        /* stop DMA */
+        regs->SP_DMA = 1;
+
+        /* restore the CONTROL bits (minus the direction flag) */
+        regs->CNTR = CNTR_PDMD | CNTR_INTEN;
+
+        /* copy from a bounce buffer, if necessary */
+        if (status && hdata->dma_bounce_buffer) {
+                if (hdata->dma_dir)
+                        memcpy(SCpnt->SCp.ptr, hdata->dma_bounce_buffer,
+                               SCpnt->SCp.this_residual);
+                kfree(hdata->dma_bounce_buffer);
+                hdata->dma_bounce_buffer = NULL;
+                hdata->dma_bounce_len = 0;
+        }
 }
 
 static int __init a2091_detect(struct scsi_host_template *tpnt)
 {
-    static unsigned char called = 0;
-    struct Scsi_Host *instance;
-    unsigned long address;
-    struct zorro_dev *z = NULL;
-    wd33c93_regs regs;
-    int num_a2091 = 0;
-
-    if (!MACH_IS_AMIGA || called)
-        return 0;
-    called = 1;
-
-    tpnt->proc_name = "A2091";
-    tpnt->proc_info = &wd33c93_proc_info;
-
-    while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
-        if (z->id != ZORRO_PROD_CBM_A590_A2091_1 &&
-            z->id != ZORRO_PROD_CBM_A590_A2091_2)
-            continue;
-        address = z->resource.start;
-        if (!request_mem_region(address, 256, "wd33c93"))
-            continue;
-
-        instance = scsi_register (tpnt, sizeof (struct WD33C93_hostdata));
-        if (instance == NULL)
-            goto release;
-        instance->base = ZTWO_VADDR(address);
-        instance->irq = IRQ_AMIGA_PORTS;
-        instance->unique_id = z->slotaddr;
-        DMA(instance)->DAWR = DAWR_A2091;
-        regs.SASR = &(DMA(instance)->SASR);
-        regs.SCMD = &(DMA(instance)->SCMD);
-        HDATA(instance)->no_sync = 0xff;
-        HDATA(instance)->fast = 0;
-        HDATA(instance)->dma_mode = CTRL_DMA;
-        wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
-        if (request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",
-                        instance))
-            goto unregister;
-        DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN;
-        num_a2091++;
-        continue;
+        static unsigned char called = 0;
+        struct Scsi_Host *instance;
+        unsigned long address;
+        struct zorro_dev *z = NULL;
+        wd33c93_regs wdregs;
+        a2091_scsiregs *regs;
+        struct WD33C93_hostdata *hdata;
+        int num_a2091 = 0;
+
+        if (!MACH_IS_AMIGA || called)
+                return 0;
+        called = 1;
+
+        tpnt->proc_name = "A2091";
+        tpnt->proc_info = &wd33c93_proc_info;
+
+        while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
+                if (z->id != ZORRO_PROD_CBM_A590_A2091_1 &&
+                    z->id != ZORRO_PROD_CBM_A590_A2091_2)
+                        continue;
+                address = z->resource.start;
+                if (!request_mem_region(address, 256, "wd33c93"))
+                        continue;
+
+                instance = scsi_register(tpnt, sizeof(struct WD33C93_hostdata));
+                if (instance == NULL)
+                        goto release;
+                instance->base = ZTWO_VADDR(address);
+                instance->irq = IRQ_AMIGA_PORTS;
+                instance->unique_id = z->slotaddr;
+                regs = (a2091_scsiregs *)(instance->base);
+                regs->DAWR = DAWR_A2091;
+                wdregs.SASR = &regs->SASR;
+                wdregs.SCMD = &regs->SCMD;
+                hdata = shost_priv(instance);
+                hdata->no_sync = 0xff;
+                hdata->fast = 0;
+                hdata->dma_mode = CTRL_DMA;
+                wd33c93_init(instance, wdregs, dma_setup, dma_stop,
+                             WD33C93_FS_8_10);
+                if (request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED,
+                                "A2091 SCSI", instance))
+                        goto unregister;
+                regs->CNTR = CNTR_PDMD | CNTR_INTEN;
+                num_a2091++;
+                continue;
 
 unregister:
-        scsi_unregister(instance);
-        wd33c93_release();
+                scsi_unregister(instance);
 release:
-        release_mem_region(address, 256);
-    }
+                release_mem_region(address, 256);
+        }
 
-    return num_a2091;
+        return num_a2091;
 }
 
 static int a2091_bus_reset(struct scsi_cmnd *cmd)
@@ -239,10 +243,11 @@ static struct scsi_host_template driver_template = {
 static int a2091_release(struct Scsi_Host *instance)
 {
 #ifdef MODULE
-        DMA(instance)->CNTR = 0;
+        a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+
+        regs->CNTR = 0;
         release_mem_region(ZTWO_PADDR(instance->base), 256);
         free_irq(IRQ_AMIGA_PORTS, instance);
-        wd33c93_release();
 #endif
         return 1;
 }