iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m68k/scsi: a3000 - Kill a3000_scsiregs typedef

Browse Source 
Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2009-05-17 21:05:53 +02:00
parent 349d65fdc8
commit c57c1cab78
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/a3000.c
View File

@ -27,7 +27,7 @@ static int a3000_release(struct Scsi_Host *instance);
static irqreturn_t a3000_intr(int irq, void *data) static irqreturn_t a3000_intr(int irq, void *data)
{ {
struct Scsi_Host *instance = data; struct Scsi_Host *instance = data;
a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
unsigned int status = regs->ISTR; unsigned int status = regs->ISTR;
unsigned long flags; unsigned long flags;
@ -47,7 +47,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
{ {
struct Scsi_Host *instance = cmd->device->host; struct Scsi_Host *instance = cmd->device->host;
struct WD33C93_hostdata *hdata = shost_priv(instance); struct WD33C93_hostdata *hdata = shost_priv(instance);
a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
unsigned short cntr = CNTR_PDMD | CNTR_INTEN; unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); unsigned long addr = virt_to_bus(cmd->SCp.ptr);
@ -110,7 +110,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int status) int status)
{ {
struct WD33C93_hostdata *hdata = shost_priv(instance); struct WD33C93_hostdata *hdata = shost_priv(instance);
a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
/* disable SCSI interrupts */ /* disable SCSI interrupts */
unsigned short cntr = CNTR_PDMD; unsigned short cntr = CNTR_PDMD;
@ -166,7 +166,7 @@ static int __init a3000_detect(struct scsi_host_template *tpnt)
{ {
struct Scsi_Host *instance; struct Scsi_Host *instance;
wd33c93_regs wdregs; wd33c93_regs wdregs;
a3000_scsiregs *regs; struct a3000_scsiregs *regs;
struct WD33C93_hostdata *hdata; struct WD33C93_hostdata *hdata;
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(A3000_SCSI)) if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(A3000_SCSI))
@ -183,7 +183,7 @@ static int __init a3000_detect(struct scsi_host_template *tpnt)
instance->base = ZTWO_VADDR(0xDD0000); instance->base = ZTWO_VADDR(0xDD0000);
instance->irq = IRQ_AMIGA_PORTS; instance->irq = IRQ_AMIGA_PORTS;
regs = (a3000_scsiregs *)(instance->base); regs = (struct a3000_scsiregs *)(instance->base);
regs->DAWR = DAWR_A3000; regs->DAWR = DAWR_A3000;
wdregs.SASR = &regs->SASR; wdregs.SASR = &regs->SASR;
wdregs.SCMD = &regs->SCMD; wdregs.SCMD = &regs->SCMD;
@ -243,7 +243,7 @@ static struct scsi_host_template driver_template = {
static int a3000_release(struct Scsi_Host *instance) static int a3000_release(struct Scsi_Host *instance)
{ {
a3000_scsiregs *regs = (a3000_scsiregs *)(instance->base); struct a3000_scsiregs *regs = (struct a3000_scsiregs *)(instance->base);
regs->CNTR = 0; regs->CNTR = 0;
release_mem_region(0xDD0000, 256); release_mem_region(0xDD0000, 256);

4
drivers/scsi/a3000.h
View File

@ -25,7 +25,7 @@
*/ */
#define A3000_XFER_MASK (0x00000003) #define A3000_XFER_MASK (0x00000003)
typedef struct { struct a3000_scsiregs {
unsigned char pad1[2]; unsigned char pad1[2];
volatile unsigned short DAWR; volatile unsigned short DAWR;
volatile unsigned int WTC; volatile unsigned int WTC;
@ -46,7 +46,7 @@ typedef struct {
volatile unsigned char SASR; volatile unsigned char SASR;
unsigned char pad9; unsigned char pad9;
volatile unsigned char SCMD; volatile unsigned char SCMD;
} a3000_scsiregs; };
#define DAWR_A3000 (3) #define DAWR_A3000 (3)