m68k/scsi: a2091 - Kill a2091_scsiregs typedef

Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 308541f..09b3d77 100644 (file)
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -27,7 +27,7 @@ static int a2091_release(struct Scsi_Host *instance);
 static irqreturn_t a2091_intr(int irq, void *data)
 {
        struct Scsi_Host *instance = data;
-       a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+       struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base);
        unsigned int status = regs->ISTR;
        unsigned long flags;
 
@@ -44,7 +44,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
 {
        struct Scsi_Host *instance = cmd->device->host;
        struct WD33C93_hostdata *hdata = shost_priv(instance);
-       a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+       struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base);
        unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
        unsigned long addr = virt_to_bus(cmd->SCp.ptr);
 
@@ -109,7 +109,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
                     int status)
 {
        struct WD33C93_hostdata *hdata = shost_priv(instance);
-       a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+       struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base);
 
        /* disable SCSI interrupts */
        unsigned short cntr = CNTR_PDMD;
@@ -154,7 +154,7 @@ static int __init a2091_detect(struct scsi_host_template *tpnt)
        unsigned long address;
        struct zorro_dev *z = NULL;
        wd33c93_regs wdregs;
-       a2091_scsiregs *regs;
+       struct a2091_scsiregs *regs;
        struct WD33C93_hostdata *hdata;
        int num_a2091 = 0;
 
@@ -179,7 +179,7 @@ static int __init a2091_detect(struct scsi_host_template *tpnt)
                instance->base = ZTWO_VADDR(address);
                instance->irq = IRQ_AMIGA_PORTS;
                instance->unique_id = z->slotaddr;
-               regs = (a2091_scsiregs *)(instance->base);
+               regs = (struct a2091_scsiregs *)(instance->base);
                regs->DAWR = DAWR_A2091;
                wdregs.SASR = &regs->SASR;
                wdregs.SCMD = &regs->SCMD;
@@ -243,7 +243,7 @@ static struct scsi_host_template driver_template = {
 static int a2091_release(struct Scsi_Host *instance)
 {
 #ifdef MODULE
-       a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
+       struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base);
 
        regs->CNTR = 0;
        release_mem_region(ZTWO_PADDR(instance->base), 256);

diff --git a/drivers/scsi/a2091.h b/drivers/scsi/a2091.h
index 1c3daa1..794b8e6 100644 (file)
--- a/drivers/scsi/a2091.h
+++ b/drivers/scsi/a2091.h
@@ -25,7 +25,7 @@
  */
 #define A2091_XFER_MASK                (0xff000001)
 
-typedef struct {
+struct a2091_scsiregs {
                 unsigned char  pad1[64];
        volatile unsigned short ISTR;
        volatile unsigned short CNTR;
@@ -44,7 +44,7 @@ typedef struct {
        volatile unsigned short CINT;
                 unsigned char  pad7[2];
        volatile unsigned short FLUSH;
-} a2091_scsiregs;
+};
 
 #define DAWR_A2091             (3)