lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k/scsi: a2091 - Kill a2091_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:54 +02:00
parent 11ca46eaf2
commit 56522e39ab
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/a2091.c
View File

@@ -27,7 +27,7 @@ static int a2091_release(struct Scsi_Host *instance);
static irqreturn_t a2091_intr(int irq, void *data) static irqreturn_t a2091_intr(int irq, void *data)
{ {
struct Scsi_Host *instance = 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 int status = regs->ISTR;
unsigned long flags; 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 Scsi_Host *instance = cmd->device->host;
struct WD33C93_hostdata *hdata = shost_priv(instance); 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 short cntr = CNTR_PDMD | CNTR_INTEN;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); 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) int status)
{ {
struct WD33C93_hostdata *hdata = shost_priv(instance); 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 */ /* disable SCSI interrupts */
unsigned short cntr = CNTR_PDMD; unsigned short cntr = CNTR_PDMD;
@@ -154,7 +154,7 @@ static int __init a2091_detect(struct scsi_host_template *tpnt)
unsigned long address; unsigned long address;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
wd33c93_regs wdregs; wd33c93_regs wdregs;
a2091_scsiregs *regs; struct a2091_scsiregs *regs;
struct WD33C93_hostdata *hdata; struct WD33C93_hostdata *hdata;
int num_a2091 = 0; int num_a2091 = 0;
@@ -179,7 +179,7 @@ static int __init a2091_detect(struct scsi_host_template *tpnt)
instance->base = ZTWO_VADDR(address); instance->base = ZTWO_VADDR(address);
instance->irq = IRQ_AMIGA_PORTS; instance->irq = IRQ_AMIGA_PORTS;
instance->unique_id = z->slotaddr; instance->unique_id = z->slotaddr;
regs = (a2091_scsiregs *)(instance->base); regs = (struct a2091_scsiregs *)(instance->base);
regs->DAWR = DAWR_A2091; regs->DAWR = DAWR_A2091;
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 a2091_release(struct Scsi_Host *instance) static int a2091_release(struct Scsi_Host *instance)
{ {
#ifdef MODULE #ifdef MODULE
a2091_scsiregs *regs = (a2091_scsiregs *)(instance->base); struct a2091_scsiregs *regs = (struct a2091_scsiregs *)(instance->base);
regs->CNTR = 0; regs->CNTR = 0;
release_mem_region(ZTWO_PADDR(instance->base), 256); release_mem_region(ZTWO_PADDR(instance->base), 256);

4
drivers/scsi/a2091.h
View File

@@ -25,7 +25,7 @@
*/ */
#define A2091_XFER_MASK (0xff000001) #define A2091_XFER_MASK (0xff000001)
typedef struct { struct a2091_scsiregs {
unsigned char pad1[64]; unsigned char pad1[64];
volatile unsigned short ISTR; volatile unsigned short ISTR;
volatile unsigned short CNTR; volatile unsigned short CNTR;
@@ -44,7 +44,7 @@ typedef struct {
volatile unsigned short CINT; volatile unsigned short CINT;
unsigned char pad7[2]; unsigned char pad7[2];
volatile unsigned short FLUSH; volatile unsigned short FLUSH;
} a2091_scsiregs; };
#define DAWR_A2091 (3) #define DAWR_A2091 (3)