m68k/scsi: gvp11 - Do not use legacy Scsi_Host.base
[linux-2.6.git] / drivers / scsi / gvp11.c
index 5d1bf7e..2ce26eb 100644 (file)
 #include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/zorro.h>
 
-#include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
-#include <linux/zorro.h>
-#include <asm/irq.h>
-#include <linux/spinlock.h>
 
 #include "scsi.h"
-#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "gvp11.h"
 
-#include<linux/stat.h>
 
-#define DMA(ptr) ((gvp11_scsiregs *)((ptr)->base))
-#define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
+#define CHECK_WD33C93
+
+struct gvp11_hostdata {
+       struct WD33C93_hostdata wh;
+       struct gvp11_scsiregs *regs;
+};
 
-static irqreturn_t gvp11_intr (int irq, void *_instance)
+static irqreturn_t gvp11_intr(int irq, void *data)
 {
-    unsigned long flags;
-    unsigned int status;
-    struct Scsi_Host *instance = (struct Scsi_Host *)_instance;
-
-    status = DMA(instance)->CNTR;
-    if (!(status & GVP11_DMAC_INT_PENDING))
-       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;
+       struct gvp11_hostdata *hdata = shost_priv(instance);
+       unsigned int status = hdata->regs->CNTR;
+       unsigned long flags;
+
+       if (!(status & GVP11_DMAC_INT_PENDING))
+               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 gvp11_xfer_mask = 0;
 
-void gvp11_setup (char *str, int *ints)
+void gvp11_setup(char *str, int *ints)
 {
-    gvp11_xfer_mask = ints[1];
+       gvp11_xfer_mask = ints[1];
 }
 
 static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
 {
-    unsigned short cntr = GVP11_DMAC_INT_ENABLE;
-    unsigned long addr = virt_to_bus(cmd->SCp.ptr);
-    int bank_mask;
-    static int scsi_alloc_out_of_range = 0;
-
-    /* use bounce buffer if the physical address is bad */
-    if (addr & HDATA(cmd->device->host)->dma_xfer_mask)
-    {
-       HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
-           & ~0x1ff;
-
-       if( !scsi_alloc_out_of_range ) {
-           HDATA(cmd->device->host)->dma_bounce_buffer =
-               kmalloc (HDATA(cmd->device->host)->dma_bounce_len, GFP_KERNEL);
-           HDATA(cmd->device->host)->dma_buffer_pool = BUF_SCSI_ALLOCED;
-       }
+       struct Scsi_Host *instance = cmd->device->host;
+       struct gvp11_hostdata *hdata = shost_priv(instance);
+       struct WD33C93_hostdata *wh = &hdata->wh;
+       struct gvp11_scsiregs *regs = hdata->regs;
+       unsigned short cntr = GVP11_DMAC_INT_ENABLE;
+       unsigned long addr = virt_to_bus(cmd->SCp.ptr);
+       int bank_mask;
+       static int scsi_alloc_out_of_range = 0;
+
+       /* use bounce buffer if the physical address is bad */
+       if (addr & wh->dma_xfer_mask) {
+               wh->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff;
+
+               if (!scsi_alloc_out_of_range) {
+                       wh->dma_bounce_buffer =
+                               kmalloc(wh->dma_bounce_len, GFP_KERNEL);
+                       wh->dma_buffer_pool = BUF_SCSI_ALLOCED;
+               }
 
-       if (scsi_alloc_out_of_range ||
-           !HDATA(cmd->device->host)->dma_bounce_buffer) {
-           HDATA(cmd->device->host)->dma_bounce_buffer =
-               amiga_chip_alloc(HDATA(cmd->device->host)->dma_bounce_len,
-                                      "GVP II SCSI Bounce Buffer");
+               if (scsi_alloc_out_of_range ||
+                   !wh->dma_bounce_buffer) {
+                       wh->dma_bounce_buffer =
+                               amiga_chip_alloc(wh->dma_bounce_len,
+                                                "GVP II SCSI Bounce Buffer");
 
-           if(!HDATA(cmd->device->host)->dma_bounce_buffer)
-           {
-               HDATA(cmd->device->host)->dma_bounce_len = 0;
-               return 1;
-           }
+                       if (!wh->dma_bounce_buffer) {
+                               wh->dma_bounce_len = 0;
+                               return 1;
+                       }
 
-           HDATA(cmd->device->host)->dma_buffer_pool = BUF_CHIP_ALLOCED;
-       }
+                       wh->dma_buffer_pool = BUF_CHIP_ALLOCED;
+               }
 
-       /* check if the address of the bounce buffer is OK */
-       addr = virt_to_bus(HDATA(cmd->device->host)->dma_bounce_buffer);
-
-       if (addr & HDATA(cmd->device->host)->dma_xfer_mask) {
-           /* fall back to Chip RAM if address out of range */
-           if( HDATA(cmd->device->host)->dma_buffer_pool == BUF_SCSI_ALLOCED) {
-               kfree (HDATA(cmd->device->host)->dma_bounce_buffer);
-               scsi_alloc_out_of_range = 1;
-           } else {
-               amiga_chip_free (HDATA(cmd->device->host)->dma_bounce_buffer);
-            }
-               
-           HDATA(cmd->device->host)->dma_bounce_buffer =
-               amiga_chip_alloc(HDATA(cmd->device->host)->dma_bounce_len,
-                                      "GVP II SCSI Bounce Buffer");
-
-           if(!HDATA(cmd->device->host)->dma_bounce_buffer)
-           {
-               HDATA(cmd->device->host)->dma_bounce_len = 0;
-               return 1;
-           }
-
-           addr = virt_to_bus(HDATA(cmd->device->host)->dma_bounce_buffer);
-           HDATA(cmd->device->host)->dma_buffer_pool = BUF_CHIP_ALLOCED;
-       }
-           
-       if (!dir_in) {
-           /* copy to bounce buffer for a write */
-           memcpy (HDATA(cmd->device->host)->dma_bounce_buffer,
-                   cmd->SCp.ptr, cmd->SCp.this_residual);
+               /* check if the address of the bounce buffer is OK */
+               addr = virt_to_bus(wh->dma_bounce_buffer);
+
+               if (addr & wh->dma_xfer_mask) {
+                       /* fall back to Chip RAM if address out of range */
+                       if (wh->dma_buffer_pool == BUF_SCSI_ALLOCED) {
+                               kfree(wh->dma_bounce_buffer);
+                               scsi_alloc_out_of_range = 1;
+                       } else {
+                               amiga_chip_free(wh->dma_bounce_buffer);
+                       }
+
+                       wh->dma_bounce_buffer =
+                               amiga_chip_alloc(wh->dma_bounce_len,
+                                                "GVP II SCSI Bounce Buffer");
+
+                       if (!wh->dma_bounce_buffer) {
+                               wh->dma_bounce_len = 0;
+                               return 1;
+                       }
+
+                       addr = virt_to_bus(wh->dma_bounce_buffer);
+                       wh->dma_buffer_pool = BUF_CHIP_ALLOCED;
+               }
+
+               if (!dir_in) {
+                       /* copy to bounce buffer for a write */
+                       memcpy(wh->dma_bounce_buffer, cmd->SCp.ptr,
+                              cmd->SCp.this_residual);
+               }
        }
-    }
 
-    /* setup dma direction */
-    if (!dir_in)
-       cntr |= GVP11_DMAC_DIR_WRITE;
+       /* setup dma direction */
+       if (!dir_in)
+               cntr |= GVP11_DMAC_DIR_WRITE;
 
-    HDATA(cmd->device->host)->dma_dir = dir_in;
-    DMA(cmd->device->host)->CNTR = cntr;
+       wh->dma_dir = dir_in;
+       regs->CNTR = cntr;
 
-    /* setup DMA *physical* address */
-    DMA(cmd->device->host)->ACR = addr;
+       /* setup DMA *physical* address */
+       regs->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);
+       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);
+       }
 
-    if ((bank_mask = (~HDATA(cmd->device->host)->dma_xfer_mask >> 18) & 0x01c0))
-           DMA(cmd->device->host)->BANK = bank_mask & (addr >> 18);
+       bank_mask = (~wh->dma_xfer_mask >> 18) & 0x01c0;
+       if (bank_mask)
+               regs->BANK = bank_mask & (addr >> 18);
 
-    /* start DMA */
-    DMA(cmd->device->host)->ST_DMA = 1;
+       /* 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)
 {
-    /* stop DMA */
-    DMA(instance)->SP_DMA = 1;
-    /* remove write bit from CONTROL bits */
-    DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
-
-    /* copy from a bounce buffer, if necessary */
-    if (status && HDATA(instance)->dma_bounce_buffer) {
-       if (HDATA(instance)->dma_dir && SCpnt)
-           memcpy (SCpnt->SCp.ptr, 
-                   HDATA(instance)->dma_bounce_buffer,
-                   SCpnt->SCp.this_residual);
-       
-       if (HDATA(instance)->dma_buffer_pool == BUF_SCSI_ALLOCED)
-           kfree (HDATA(instance)->dma_bounce_buffer);
-       else
-           amiga_chip_free(HDATA(instance)->dma_bounce_buffer);
-       
-       HDATA(instance)->dma_bounce_buffer = NULL;
-       HDATA(instance)->dma_bounce_len = 0;
-    }
+       struct gvp11_hostdata *hdata = shost_priv(instance);
+       struct WD33C93_hostdata *wh = &hdata->wh;
+       struct gvp11_scsiregs *regs = hdata->regs;
+
+       /* stop DMA */
+       regs->SP_DMA = 1;
+       /* remove write bit from CONTROL bits */
+       regs->CNTR = GVP11_DMAC_INT_ENABLE;
+
+       /* copy from a bounce buffer, if necessary */
+       if (status && wh->dma_bounce_buffer) {
+               if (wh->dma_dir && SCpnt)
+                       memcpy(SCpnt->SCp.ptr, wh->dma_bounce_buffer,
+                              SCpnt->SCp.this_residual);
+
+               if (wh->dma_buffer_pool == BUF_SCSI_ALLOCED)
+                       kfree(wh->dma_bounce_buffer);
+               else
+                       amiga_chip_free(wh->dma_bounce_buffer);
+
+               wh->dma_bounce_buffer = NULL;
+               wh->dma_bounce_len = 0;
+       }
 }
 
-#define CHECK_WD33C93
-
-int __init gvp11_detect(struct scsi_host_template *tpnt)
+static int gvp11_bus_reset(struct scsi_cmnd *cmd)
 {
-    static unsigned char called = 0;
-    struct Scsi_Host *instance;
-    unsigned long address;
-    unsigned int epc;
-    struct zorro_dev *z = NULL;
-    unsigned int default_dma_xfer_mask;
-    wd33c93_regs regs;
-    int num_gvp11 = 0;
-#ifdef CHECK_WD33C93
-    volatile unsigned char *sasr_3393, *scmd_3393;
-    unsigned char save_sasr;
-    unsigned char q, qq;
-#endif
+       struct Scsi_Host *instance = cmd->device->host;
 
-    if (!MACH_IS_AMIGA || called)
-       return 0;
-    called = 1;
-
-    tpnt->proc_name = "GVP11";
-    tpnt->proc_info = &wd33c93_proc_info;
+       /* FIXME perform bus-specific reset */
 
-    while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
-       /* 
-        * This should (hopefully) be the correct way to identify
-        * all the different GVP SCSI controllers (except for the
-        * SERIES I though).
-        */
+       /* FIXME 2: shouldn't we no-op this function (return
+          FAILED), and fall back to host reset function,
+          wd33c93_host_reset ? */
 
-       if (z->id == ZORRO_PROD_GVP_COMBO_030_R3_SCSI ||
-           z->id == ZORRO_PROD_GVP_SERIES_II)
-           default_dma_xfer_mask = ~0x00ffffff;
-       else if (z->id == ZORRO_PROD_GVP_GFORCE_030_SCSI ||
-                z->id == ZORRO_PROD_GVP_A530_SCSI ||
-                z->id == ZORRO_PROD_GVP_COMBO_030_R4_SCSI)
-           default_dma_xfer_mask = ~0x01ffffff;
-       else if (z->id == ZORRO_PROD_GVP_A1291 ||
-                z->id == ZORRO_PROD_GVP_GFORCE_040_SCSI_1)
-           default_dma_xfer_mask = ~0x07ffffff;
-       else
-           continue;
+       spin_lock_irq(instance->host_lock);
+       wd33c93_host_reset(cmd);
+       spin_unlock_irq(instance->host_lock);
 
-       /*
-        * Rumors state that some GVP ram boards use the same product
-        * code as the SCSI controllers. Therefore if the board-size
-        * is not 64KB we asume it is a ram board and bail out.
-        */
-       if (z->resource.end-z->resource.start != 0xffff)
-               continue;
+       return SUCCESS;
+}
 
-       address = z->resource.start;
-       if (!request_mem_region(address, 256, "wd33c93"))
-           continue;
+static struct scsi_host_template gvp11_scsi_template = {
+       .module                 = THIS_MODULE,
+       .name                   = "GVP Series II SCSI",
+       .proc_info              = wd33c93_proc_info,
+       .proc_name              = "GVP11",
+       .queuecommand           = wd33c93_queuecommand,
+       .eh_abort_handler       = wd33c93_abort,
+       .eh_bus_reset_handler   = gvp11_bus_reset,
+       .eh_host_reset_handler  = wd33c93_host_reset,
+       .can_queue              = CAN_QUEUE,
+       .this_id                = 7,
+       .sg_tablesize           = SG_ALL,
+       .cmd_per_lun            = CMD_PER_LUN,
+       .use_clustering         = DISABLE_CLUSTERING
+};
 
+static int __devinit check_wd33c93(struct gvp11_scsiregs *regs)
+{
 #ifdef CHECK_WD33C93
+       volatile unsigned char *sasr_3393, *scmd_3393;
+       unsigned char save_sasr;
+       unsigned char q, qq;
 
        /*
         * These darn GVP boards are a problem - it can be tough to tell
@@ -230,37 +216,37 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
         * ultimate Yet-Another-GVP-Detection-Hack in that it actually
         * probes for a WD33c93 chip: If we find one, it's extremely
         * likely that this card supports SCSI, regardless of Product_
-        * Code, Board_Size, etc. 
+        * Code, Board_Size, etc.
         */
 
-    /* Get pointers to the presumed register locations and save contents */
+       /* Get pointers to the presumed register locations and save contents */
 
-       sasr_3393 = &(((gvp11_scsiregs *)(ZTWO_VADDR(address)))->SASR);
-       scmd_3393 = &(((gvp11_scsiregs *)(ZTWO_VADDR(address)))->SCMD);
+       sasr_3393 = &regs->SASR;
+       scmd_3393 = &regs->SCMD;
        save_sasr = *sasr_3393;
 
-    /* First test the AuxStatus Reg */
+       /* First test the AuxStatus Reg */
 
-       q = *sasr_3393;         /* read it */
-       if (q & 0x08)           /* bit 3 should always be clear */
-               goto release;
-       *sasr_3393 = WD_AUXILIARY_STATUS;        /* setup indirect address */
-       if (*sasr_3393 == WD_AUXILIARY_STATUS) { /* shouldn't retain the write */
+       q = *sasr_3393; /* read it */
+       if (q & 0x08)   /* bit 3 should always be clear */
+               return -ENODEV;
+       *sasr_3393 = WD_AUXILIARY_STATUS;       /* setup indirect address */
+       if (*sasr_3393 == WD_AUXILIARY_STATUS) {        /* shouldn't retain the write */
                *sasr_3393 = save_sasr; /* Oops - restore this byte */
-               goto release;
-               }
+               return -ENODEV;
+       }
        if (*sasr_3393 != q) {  /* should still read the same */
                *sasr_3393 = save_sasr; /* Oops - restore this byte */
-               goto release;
-               }
+               return -ENODEV;
+       }
        if (*scmd_3393 != q)    /* and so should the image at 0x1f */
-               goto release;
+               return -ENODEV;
 
-
-    /* Ok, we probably have a wd33c93, but let's check a few other places
-     * for good measure. Make sure that this works for both 'A and 'B    
-     * chip versions.
-     */
+       /*
+        * Ok, we probably have a wd33c93, but let's check a few other places
+        * for good measure. Make sure that this works for both 'A and 'B
+        * chip versions.
+        */
 
        *sasr_3393 = WD_SCSI_STATUS;
        q = *scmd_3393;
@@ -270,8 +256,8 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
        qq = *scmd_3393;
        *sasr_3393 = WD_SCSI_STATUS;
        *scmd_3393 = q;
-       if (qq != q)                    /* should be read only */
-               goto release;
+       if (qq != q)    /* should be read only */
+               return -ENODEV;
        *sasr_3393 = 0x1e;      /* this register is unimplemented */
        q = *scmd_3393;
        *sasr_3393 = 0x1e;
@@ -281,7 +267,7 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
        *sasr_3393 = 0x1e;
        *scmd_3393 = q;
        if (qq != q || qq != 0xff)      /* should be read only, all 1's */
-               goto release;
+               return -ENODEV;
        *sasr_3393 = WD_TIMEOUT_PERIOD;
        q = *scmd_3393;
        *sasr_3393 = WD_TIMEOUT_PERIOD;
@@ -290,110 +276,157 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
        qq = *scmd_3393;
        *sasr_3393 = WD_TIMEOUT_PERIOD;
        *scmd_3393 = q;
-       if (qq != (~q & 0xff))          /* should be read/write */
-               goto release;
-#endif
-
-       instance = scsi_register (tpnt, sizeof (struct WD33C93_hostdata));
-       if(instance == NULL)
-               goto release;
-       instance->base = ZTWO_VADDR(address);
+       if (qq != (~q & 0xff))  /* should be read/write */
+               return -ENODEV;
+#endif /* CHECK_WD33C93 */
+
+       return 0;
+}
+
+static int __devinit gvp11_probe(struct zorro_dev *z,
+                                const struct zorro_device_id *ent)
+{
+       struct Scsi_Host *instance;
+       unsigned long address;
+       int error;
+       unsigned int epc;
+       unsigned int default_dma_xfer_mask;
+       struct gvp11_hostdata *hdata;
+       struct gvp11_scsiregs *regs;
+       wd33c93_regs wdregs;
+
+       default_dma_xfer_mask = ent->driver_data;
+
+       /*
+        * Rumors state that some GVP ram boards use the same product
+        * code as the SCSI controllers. Therefore if the board-size
+        * is not 64KB we asume it is a ram board and bail out.
+        */
+       if (zorro_resource_len(z) != 0x10000)
+               return -ENODEV;
+
+       address = z->resource.start;
+       if (!request_mem_region(address, 256, "wd33c93"))
+               return -EBUSY;
+
+       regs = (struct gvp11_scsiregs *)(ZTWO_VADDR(address));
+
+       error = check_wd33c93(regs);
+       if (error)
+               goto fail_check_or_alloc;
+
+       instance = scsi_host_alloc(&gvp11_scsi_template,
+                                  sizeof(struct gvp11_hostdata));
+       if (!instance) {
+               error = -ENOMEM;
+               goto fail_check_or_alloc;
+       }
+
        instance->irq = IRQ_AMIGA_PORTS;
        instance->unique_id = z->slotaddr;
 
-       if (gvp11_xfer_mask)
-               HDATA(instance)->dma_xfer_mask = gvp11_xfer_mask;
-       else
-               HDATA(instance)->dma_xfer_mask = default_dma_xfer_mask;
-
+       regs->secret2 = 1;
+       regs->secret1 = 0;
+       regs->secret3 = 15;
+       while (regs->CNTR & GVP11_DMAC_BUSY)
+               ;
+       regs->CNTR = 0;
+       regs->BANK = 0;
 
-       DMA(instance)->secret2 = 1;
-       DMA(instance)->secret1 = 0;
-       DMA(instance)->secret3 = 15;
-       while (DMA(instance)->CNTR & GVP11_DMAC_BUSY) ;
-       DMA(instance)->CNTR = 0;
+       wdregs.SASR = &regs->SASR;
+       wdregs.SCMD = &regs->SCMD;
 
-       DMA(instance)->BANK = 0;
+       hdata = shost_priv(instance);
+       if (gvp11_xfer_mask)
+               hdata->wh.dma_xfer_mask = gvp11_xfer_mask;
+       else
+               hdata->wh.dma_xfer_mask = default_dma_xfer_mask;
 
-       epc = *(unsigned short *)(ZTWO_VADDR(address) + 0x8000);
+       hdata->wh.no_sync = 0xff;
+       hdata->wh.fast = 0;
+       hdata->wh.dma_mode = CTRL_DMA;
+       hdata->regs = regs;
 
        /*
         * Check for 14MHz SCSI clock
         */
-       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,
+       epc = *(unsigned short *)(ZTWO_VADDR(address) + 0x8000);
+       wd33c93_init(instance, wdregs, dma_setup, dma_stop,
                     (epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10
                                             : WD33C93_FS_12_15);
 
-       if (request_irq(IRQ_AMIGA_PORTS, gvp11_intr, IRQF_SHARED, "GVP11 SCSI",
-                       instance))
-               goto unregister;
-       DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
-       num_gvp11++;
-       continue;
-
-unregister:
-       scsi_unregister(instance);
-       wd33c93_release();
-release:
-       release_mem_region(address, 256);
-    }
-
-    return num_gvp11;
-}
+       error = request_irq(IRQ_AMIGA_PORTS, gvp11_intr, IRQF_SHARED,
+                           "GVP11 SCSI", instance);
+       if (error)
+               goto fail_irq;
 
-static int gvp11_bus_reset(struct scsi_cmnd *cmd)
-{
-       /* FIXME perform bus-specific reset */
+       regs->CNTR = GVP11_DMAC_INT_ENABLE;
 
-       /* FIXME 2: shouldn't we no-op this function (return
-          FAILED), and fall back to host reset function,
-          wd33c93_host_reset ? */
+       error = scsi_add_host(instance, NULL);
+       if (error)
+               goto fail_host;
 
-       spin_lock_irq(cmd->device->host->host_lock);
-       wd33c93_host_reset(cmd);
-       spin_unlock_irq(cmd->device->host->host_lock);
+       zorro_set_drvdata(z, instance);
+       scsi_scan_host(instance);
+       return 0;
 
-       return SUCCESS;
+fail_host:
+       free_irq(IRQ_AMIGA_PORTS, instance);
+fail_irq:
+       scsi_host_put(instance);
+fail_check_or_alloc:
+       release_mem_region(address, 256);
+       return error;
 }
 
+static void __devexit gvp11_remove(struct zorro_dev *z)
+{
+       struct Scsi_Host *instance = zorro_get_drvdata(z);
+       struct gvp11_hostdata *hdata = shost_priv(instance);
+
+       hdata->regs->CNTR = 0;
+       scsi_remove_host(instance);
+       free_irq(IRQ_AMIGA_PORTS, instance);
+       scsi_host_put(instance);
+       release_mem_region(z->resource.start, 256);
+}
 
-#define HOSTS_C
-
-#include "gvp11.h"
+       /*
+        * This should (hopefully) be the correct way to identify
+        * all the different GVP SCSI controllers (except for the
+        * SERIES I though).
+        */
 
-static struct scsi_host_template driver_template = {
-       .proc_name              = "GVP11",
-       .name                   = "GVP Series II SCSI",
-       .detect                 = gvp11_detect,
-       .release                = gvp11_release,
-       .queuecommand           = wd33c93_queuecommand,
-       .eh_abort_handler       = wd33c93_abort,
-       .eh_bus_reset_handler   = gvp11_bus_reset,
-       .eh_host_reset_handler  = wd33c93_host_reset,
-       .can_queue              = CAN_QUEUE,
-       .this_id                = 7,
-       .sg_tablesize           = SG_ALL,
-       .cmd_per_lun            = CMD_PER_LUN,
-       .use_clustering         = DISABLE_CLUSTERING
+static struct zorro_device_id gvp11_zorro_tbl[] __devinitdata = {
+       { ZORRO_PROD_GVP_COMBO_030_R3_SCSI,     ~0x00ffffff },
+       { ZORRO_PROD_GVP_SERIES_II,             ~0x00ffffff },
+       { ZORRO_PROD_GVP_GFORCE_030_SCSI,       ~0x01ffffff },
+       { ZORRO_PROD_GVP_A530_SCSI,             ~0x01ffffff },
+       { ZORRO_PROD_GVP_COMBO_030_R4_SCSI,     ~0x01ffffff },
+       { ZORRO_PROD_GVP_A1291,                 ~0x07ffffff },
+       { ZORRO_PROD_GVP_GFORCE_040_SCSI_1,     ~0x07ffffff },
+       { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, gvp11_zorro_tbl);
 
+static struct zorro_driver gvp11_driver = {
+       .name           = "gvp11",
+       .id_table       = gvp11_zorro_tbl,
+       .probe          = gvp11_probe,
+       .remove         = __devexit_p(gvp11_remove),
+};
 
-#include "scsi_module.c"
+static int __init gvp11_init(void)
+{
+       return zorro_register_driver(&gvp11_driver);
+}
+module_init(gvp11_init);
 
-int gvp11_release(struct Scsi_Host *instance)
+static void __exit gvp11_exit(void)
 {
-#ifdef MODULE
-    DMA(instance)->CNTR = 0;
-    release_mem_region(ZTWO_PADDR(instance->base), 256);
-    free_irq(IRQ_AMIGA_PORTS, instance);
-    wd33c93_release();
-#endif
-    return 1;
+       zorro_unregister_driver(&gvp11_driver);
 }
+module_exit(gvp11_exit);
 
+MODULE_DESCRIPTION("GVP Series II SCSI");
 MODULE_LICENSE("GPL");