aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2009-05-17 15:05:53 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-05-26 13:51:07 -0400
commitc57c1cab789e4d54fd767fb844e3a309c754e6ed (patch)
tree29d70172a3cc91b591ebb2ca70154c23b259b4d4 /drivers/scsi
parent349d65fdc8e5bb3335fa5e6984ca2c12154a8269 (diff)
m68k/scsi: a3000 - Kill a3000_scsiregs typedef
Acked-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/a3000.c12
-rw-r--r--drivers/scsi/a3000.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index eabc41b65dad..79a4a3c97474 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -27,7 +27,7 @@ static int a3000_release(struct Scsi_Host *instance);
27static irqreturn_t a3000_intr(int irq, void *data) 27static irqreturn_t a3000_intr(int irq, void *data)
28{ 28{
29 struct Scsi_Host *instance = data; 29 struct Scsi_Host *instance = data;
30 a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); 30 struct a3000_scsiregs *regs = (struct a3000_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
@@ -47,7 +47,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
47{ 47{
48 struct Scsi_Host *instance = cmd->device->host; 48 struct Scsi_Host *instance = cmd->device->host;
49 struct WD33C93_hostdata *hdata = shost_priv(instance); 49 struct WD33C93_hostdata *hdata = shost_priv(instance);
50 a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); 50 struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
51 unsigned short cntr = CNTR_PDMD | CNTR_INTEN; 51 unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
52 unsigned long addr = virt_to_bus(cmd->SCp.ptr); 52 unsigned long addr = virt_to_bus(cmd->SCp.ptr);
53 53
@@ -110,7 +110,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
110 int status) 110 int status)
111{ 111{
112 struct WD33C93_hostdata *hdata = shost_priv(instance); 112 struct WD33C93_hostdata *hdata = shost_priv(instance);
113 a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); 113 struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
114 114
115 /* disable SCSI interrupts */ 115 /* disable SCSI interrupts */
116 unsigned short cntr = CNTR_PDMD; 116 unsigned short cntr = CNTR_PDMD;
@@ -166,7 +166,7 @@ static int __init a3000_detect(struct scsi_host_template *tpnt)
166{ 166{
167 struct Scsi_Host *instance; 167 struct Scsi_Host *instance;
168 wd33c93_regs wdregs; 168 wd33c93_regs wdregs;
169 a3000_scsiregs *regs; 169 struct a3000_scsiregs *regs;
170 struct WD33C93_hostdata *hdata; 170 struct WD33C93_hostdata *hdata;
171 171
172 if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(A3000_SCSI)) 172 if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(A3000_SCSI))
@@ -183,7 +183,7 @@ static int __init a3000_detect(struct scsi_host_template *tpnt)
183 183
184 instance->base = ZTWO_VADDR(0xDD0000); 184 instance->base = ZTWO_VADDR(0xDD0000);
185 instance->irq = IRQ_AMIGA_PORTS; 185 instance->irq = IRQ_AMIGA_PORTS;
186 regs = (a3000_scsiregs *)(instance->base); 186 regs = (struct a3000_scsiregs *)(instance->base);
187 regs->DAWR = DAWR_A3000; 187 regs->DAWR = DAWR_A3000;
188 wdregs.SASR = &regs->SASR; 188 wdregs.SASR = &regs->SASR;
189 wdregs.SCMD = &regs->SCMD; 189 wdregs.SCMD = &regs->SCMD;
@@ -243,7 +243,7 @@ static struct scsi_host_template driver_template = {
243 243
244static int a3000_release(struct Scsi_Host *instance) 244static int a3000_release(struct Scsi_Host *instance)
245{ 245{
246 a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); 246 struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
247 247
248 regs->CNTR = 0; 248 regs->CNTR = 0;
249 release_mem_region(0xDD0000, 256); 249 release_mem_region(0xDD0000, 256);
diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h
index 684813ee378c..49db4a335aab 100644
--- a/drivers/scsi/a3000.h
+++ b/drivers/scsi/a3000.h
@@ -25,7 +25,7 @@
25 */ 25 */
26#define A3000_XFER_MASK (0x00000003) 26#define A3000_XFER_MASK (0x00000003)
27 27
28typedef struct { 28struct a3000_scsiregs {
29 unsigned char pad1[2]; 29 unsigned char pad1[2];
30 volatile unsigned short DAWR; 30 volatile unsigned short DAWR;
31 volatile unsigned int WTC; 31 volatile unsigned int WTC;
@@ -46,7 +46,7 @@ typedef struct {
46 volatile unsigned char SASR; 46 volatile unsigned char SASR;
47 unsigned char pad9; 47 unsigned char pad9;
48 volatile unsigned char SCMD; 48 volatile unsigned char SCMD;
49} a3000_scsiregs; 49};
50 50
51#define DAWR_A3000 (3) 51#define DAWR_A3000 (3)
52 52