aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2009-05-17 21:05:53 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-05-26 19:51:07 +0200
commitc57c1cab789e4d54fd767fb844e3a309c754e6ed (patch)
tree29d70172a3cc91b591ebb2ca70154c23b259b4d4 /drivers/scsi
parent349d65fdc8e5bb3335fa5e6984ca2c12154a8269 (diff)
downloadlinux-2.6.34-ux500-c57c1cab789e4d54fd767fb844e3a309c754e6ed.tar.gz
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 eabc41b65da..79a4a3c9747 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -27,7 +27,7 @@ static int a3000_release(struct Scsi_Host *instance);
static irqreturn_t a3000_intr(int irq, void *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 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 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 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)
{
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 */
unsigned short cntr = CNTR_PDMD;
@@ -166,7 +166,7 @@ static int __init a3000_detect(struct scsi_host_template *tpnt)
{
struct Scsi_Host *instance;
wd33c93_regs wdregs;
- a3000_scsiregs *regs;
+ struct a3000_scsiregs *regs;
struct WD33C93_hostdata *hdata;
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->irq = IRQ_AMIGA_PORTS;
- regs = (a3000_scsiregs *)(instance->base);
+ regs = (struct a3000_scsiregs *)(instance->base);
regs->DAWR = DAWR_A3000;
wdregs.SASR = &regs->SASR;
wdregs.SCMD = &regs->SCMD;
@@ -243,7 +243,7 @@ static struct scsi_host_template driver_template = {
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;
release_mem_region(0xDD0000, 256);
diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h
index 684813ee378..49db4a335aa 100644
--- a/drivers/scsi/a3000.h
+++ b/drivers/scsi/a3000.h
@@ -25,7 +25,7 @@
*/
#define A3000_XFER_MASK (0x00000003)
-typedef struct {
+struct a3000_scsiregs {
unsigned char pad1[2];
volatile unsigned short DAWR;
volatile unsigned int WTC;
@@ -46,7 +46,7 @@ typedef struct {
volatile unsigned char SASR;
unsigned char pad9;
volatile unsigned char SCMD;
-} a3000_scsiregs;
+};
#define DAWR_A3000 (3)