Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 56522e39ab75ea7f1f4f5fe4cb760f00815f3d81

Authored by Geert Uytterhoeven
1 parent 11ca46eaf2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

m68k/scsi: a2091 - Kill a2091_scsiregs typedef 

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

Showing 2 changed files with 8 additions and 8 deletions Side-by-side Diff

drivers/scsi/a2091.c
Diff comments   View file @ 56522e3
... ... @@ -27,7 +27,7 @@
27 27 static irqreturn_t a2091_intr(int irq, void *data)
28 28 {
29 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 31 unsigned int status = regs->ISTR;
32 32 unsigned long flags;
33 33  
... ... @@ -44,7 +44,7 @@
44 44 {
45 45 struct Scsi_Host *instance = cmd->device->host;
46 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 48 unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
49 49 unsigned long addr = virt_to_bus(cmd->SCp.ptr);
50 50  
... ... @@ -109,7 +109,7 @@
109 109 int status)
110 110 {
111 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 114 /* disable SCSI interrupts */
115 115 unsigned short cntr = CNTR_PDMD;
... ... @@ -154,7 +154,7 @@
154 154 unsigned long address;
155 155 struct zorro_dev *z = NULL;
156 156 wd33c93_regs wdregs;
157   - a2091_scsiregs *regs;
  157 + struct a2091_scsiregs *regs;
158 158 struct WD33C93_hostdata *hdata;
159 159 int num_a2091 = 0;
160 160  
... ... @@ -179,7 +179,7 @@
179 179 instance->base = ZTWO_VADDR(address);
180 180 instance->irq = IRQ_AMIGA_PORTS;
181 181 instance->unique_id = z->slotaddr;
182   - regs = (a2091_scsiregs *)(instance->base);
  182 + regs = (struct a2091_scsiregs *)(instance->base);
183 183 regs->DAWR = DAWR_A2091;
184 184 wdregs.SASR = &regs->SASR;
185 185 wdregs.SCMD = &regs->SCMD;
... ... @@ -243,7 +243,7 @@
243 243 static int a2091_release(struct Scsi_Host *instance)
244 244 {
245 245 #ifdef MODULE
246   - a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base);
  246 + struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base);
247 247  
248 248 regs->CNTR = 0;
249 249 release_mem_region(ZTWO_PADDR(instance->base), 256);
drivers/scsi/a2091.h
Diff comments   View file @ 56522e3
... ... @@ -25,7 +25,7 @@
25 25 */
26 26 #define A2091_XFER_MASK (0xff000001)
27 27  
28   -typedef struct {
  28 +struct a2091_scsiregs {
29 29 unsigned char pad1[64];
30 30 volatile unsigned short ISTR;
31 31 volatile unsigned short CNTR;
... ... @@ -44,7 +44,7 @@
44 44 volatile unsigned short CINT;
45 45 unsigned char pad7[2];
46 46 volatile unsigned short FLUSH;
47   -} a2091_scsiregs;
  47 +};
48 48  
49 49 #define DAWR_A2091 (3)
50 50