diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-05-17 15:05:54 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-05-26 13:51:07 -0400 |
commit | 56522e39ab75ea7f1f4f5fe4cb760f00815f3d81 (patch) | |
tree | 7ceacc4396f5cd3251c45a451eea62cf1c75583a | |
parent | 11ca46eaf207e2fde20f6207b6a3ae7b6295da07 (diff) |
m68k/scsi: a2091 - Kill a2091_scsiregs typedef
Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | drivers/scsi/a2091.c | 12 | ||||
-rw-r--r-- | drivers/scsi/a2091.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index 308541ff85cf..09b3d77db03f 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c | |||
@@ -27,7 +27,7 @@ static int a2091_release(struct Scsi_Host *instance); | |||
27 | static irqreturn_t a2091_intr(int irq, void *data) | 27 | static irqreturn_t a2091_intr(int irq, void *data) |
28 | { | 28 | { |
29 | struct Scsi_Host *instance = data; | 29 | struct Scsi_Host *instance = data; |
30 | a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base); | 30 | struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base); |
31 | unsigned int status = regs->ISTR; | 31 | unsigned int status = regs->ISTR; |
32 | unsigned long flags; | 32 | unsigned long flags; |
33 | 33 | ||
@@ -44,7 +44,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) | |||
44 | { | 44 | { |
45 | struct Scsi_Host *instance = cmd->device->host; | 45 | struct Scsi_Host *instance = cmd->device->host; |
46 | struct WD33C93_hostdata *hdata = shost_priv(instance); | 46 | struct WD33C93_hostdata *hdata = shost_priv(instance); |
47 | a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base); | 47 | struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base); |
48 | unsigned short cntr = CNTR_PDMD | CNTR_INTEN; | 48 | unsigned short cntr = CNTR_PDMD | CNTR_INTEN; |
49 | unsigned long addr = virt_to_bus(cmd->SCp.ptr); | 49 | unsigned long addr = virt_to_bus(cmd->SCp.ptr); |
50 | 50 | ||
@@ -109,7 +109,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, | |||
109 | int status) | 109 | int status) |
110 | { | 110 | { |
111 | struct WD33C93_hostdata *hdata = shost_priv(instance); | 111 | struct WD33C93_hostdata *hdata = shost_priv(instance); |
112 | a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base); | 112 | struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base); |
113 | 113 | ||
114 | /* disable SCSI interrupts */ | 114 | /* disable SCSI interrupts */ |
115 | unsigned short cntr = CNTR_PDMD; | 115 | unsigned short cntr = CNTR_PDMD; |
@@ -154,7 +154,7 @@ static int __init a2091_detect(struct scsi_host_template *tpnt) | |||
154 | unsigned long address; | 154 | unsigned long address; |
155 | struct zorro_dev *z = NULL; | 155 | struct zorro_dev *z = NULL; |
156 | wd33c93_regs wdregs; | 156 | wd33c93_regs wdregs; |
157 | a2091_scsiregs *regs; | 157 | struct a2091_scsiregs *regs; |
158 | struct WD33C93_hostdata *hdata; | 158 | struct WD33C93_hostdata *hdata; |
159 | int num_a2091 = 0; | 159 | int num_a2091 = 0; |
160 | 160 | ||
@@ -179,7 +179,7 @@ static int __init a2091_detect(struct scsi_host_template *tpnt) | |||
179 | instance->base = ZTWO_VADDR(address); | 179 | instance->base = ZTWO_VADDR(address); |
180 | instance->irq = IRQ_AMIGA_PORTS; | 180 | instance->irq = IRQ_AMIGA_PORTS; |
181 | instance->unique_id = z->slotaddr; | 181 | instance->unique_id = z->slotaddr; |
182 | regs = (a2091_scsiregs *)(instance->base); | 182 | regs = (struct a2091_scsiregs *)(instance->base); |
183 | regs->DAWR = DAWR_A2091; | 183 | regs->DAWR = DAWR_A2091; |
184 | wdregs.SASR = ®s->SASR; | 184 | wdregs.SASR = ®s->SASR; |
185 | wdregs.SCMD = ®s->SCMD; | 185 | wdregs.SCMD = ®s->SCMD; |
@@ -243,7 +243,7 @@ static struct scsi_host_template driver_template = { | |||
243 | static int a2091_release(struct Scsi_Host *instance) | 243 | static int a2091_release(struct Scsi_Host *instance) |
244 | { | 244 | { |
245 | #ifdef MODULE | 245 | #ifdef MODULE |
246 | a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base); | 246 | struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base); |
247 | 247 | ||
248 | regs->CNTR = 0; | 248 | regs->CNTR = 0; |
249 | release_mem_region(ZTWO_PADDR(instance->base), 256); | 249 | release_mem_region(ZTWO_PADDR(instance->base), 256); |
diff --git a/drivers/scsi/a2091.h b/drivers/scsi/a2091.h index 1c3daa1fd754..794b8e65c711 100644 --- a/drivers/scsi/a2091.h +++ b/drivers/scsi/a2091.h | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | #define A2091_XFER_MASK (0xff000001) | 26 | #define A2091_XFER_MASK (0xff000001) |
27 | 27 | ||
28 | typedef struct { | 28 | struct a2091_scsiregs { |
29 | unsigned char pad1[64]; | 29 | unsigned char pad1[64]; |
30 | volatile unsigned short ISTR; | 30 | volatile unsigned short ISTR; |
31 | volatile unsigned short CNTR; | 31 | volatile unsigned short CNTR; |
@@ -44,7 +44,7 @@ typedef struct { | |||
44 | volatile unsigned short CINT; | 44 | volatile unsigned short CINT; |
45 | unsigned char pad7[2]; | 45 | unsigned char pad7[2]; |
46 | volatile unsigned short FLUSH; | 46 | volatile unsigned short FLUSH; |
47 | } a2091_scsiregs; | 47 | }; |
48 | 48 | ||
49 | #define DAWR_A2091 (3) | 49 | #define DAWR_A2091 (3) |
50 | 50 | ||