diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-05-17 15:05:55 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-05-26 13:51:07 -0400 |
commit | 349d65fdc8e5bb3335fa5e6984ca2c12154a8269 (patch) | |
tree | 92e8ae71acf264748893840d85540b5b77561da0 /drivers/scsi/gvp11.c | |
parent | 56522e39ab75ea7f1f4f5fe4cb760f00815f3d81 (diff) |
m68k/scsi: gvp11 - Kill gvp11_scsiregs typedef
Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/scsi/gvp11.c')
-rw-r--r-- | drivers/scsi/gvp11.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c index 59a7bff53e13..874cbee1be23 100644 --- a/drivers/scsi/gvp11.c +++ b/drivers/scsi/gvp11.c | |||
@@ -27,7 +27,7 @@ | |||
27 | static irqreturn_t gvp11_intr(int irq, void *data) | 27 | static irqreturn_t gvp11_intr(int irq, void *data) |
28 | { | 28 | { |
29 | struct Scsi_Host *instance = data; | 29 | struct Scsi_Host *instance = data; |
30 | gvp11_scsiregs *regs = (gvp11_scsiregs *)(instance->base); | 30 | struct gvp11_scsiregs *regs = (struct gvp11_scsiregs *)(instance->base); |
31 | unsigned int status = regs->CNTR; | 31 | unsigned int status = regs->CNTR; |
32 | unsigned long flags; | 32 | unsigned long flags; |
33 | 33 | ||
@@ -51,7 +51,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) | |||
51 | { | 51 | { |
52 | struct Scsi_Host *instance = cmd->device->host; | 52 | struct Scsi_Host *instance = cmd->device->host; |
53 | struct WD33C93_hostdata *hdata = shost_priv(instance); | 53 | struct WD33C93_hostdata *hdata = shost_priv(instance); |
54 | gvp11_scsiregs *regs = (gvp11_scsiregs *)(instance->base); | 54 | struct gvp11_scsiregs *regs = (struct gvp11_scsiregs *)(instance->base); |
55 | unsigned short cntr = GVP11_DMAC_INT_ENABLE; | 55 | unsigned short cntr = GVP11_DMAC_INT_ENABLE; |
56 | unsigned long addr = virt_to_bus(cmd->SCp.ptr); | 56 | unsigned long addr = virt_to_bus(cmd->SCp.ptr); |
57 | int bank_mask; | 57 | int bank_mask; |
@@ -145,7 +145,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) | |||
145 | static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, | 145 | static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, |
146 | int status) | 146 | int status) |
147 | { | 147 | { |
148 | gvp11_scsiregs *regs = (gvp11_scsiregs *)(instance->base); | 148 | struct gvp11_scsiregs *regs = (struct gvp11_scsiregs *)(instance->base); |
149 | struct WD33C93_hostdata *hdata = shost_priv(instance); | 149 | struct WD33C93_hostdata *hdata = shost_priv(instance); |
150 | 150 | ||
151 | /* stop DMA */ | 151 | /* stop DMA */ |
@@ -169,7 +169,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, | |||
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | static int __init check_wd33c93(gvp11_scsiregs *regs) | 172 | static int __init check_wd33c93(struct gvp11_scsiregs *regs) |
173 | { | 173 | { |
174 | #ifdef CHECK_WD33C93 | 174 | #ifdef CHECK_WD33C93 |
175 | volatile unsigned char *sasr_3393, *scmd_3393; | 175 | volatile unsigned char *sasr_3393, *scmd_3393; |
@@ -258,7 +258,7 @@ int __init gvp11_detect(struct scsi_host_template *tpnt) | |||
258 | struct zorro_dev *z = NULL; | 258 | struct zorro_dev *z = NULL; |
259 | unsigned int default_dma_xfer_mask; | 259 | unsigned int default_dma_xfer_mask; |
260 | struct WD33C93_hostdata *hdata; | 260 | struct WD33C93_hostdata *hdata; |
261 | gvp11_scsiregs *regs; | 261 | struct gvp11_scsiregs *regs; |
262 | wd33c93_regs wdregs; | 262 | wd33c93_regs wdregs; |
263 | int num_gvp11 = 0; | 263 | int num_gvp11 = 0; |
264 | 264 | ||
@@ -301,7 +301,7 @@ int __init gvp11_detect(struct scsi_host_template *tpnt) | |||
301 | if (!request_mem_region(address, 256, "wd33c93")) | 301 | if (!request_mem_region(address, 256, "wd33c93")) |
302 | continue; | 302 | continue; |
303 | 303 | ||
304 | regs = (gvp11_scsiregs *)(ZTWO_VADDR(address)); | 304 | regs = (struct gvp11_scsiregs *)(ZTWO_VADDR(address)); |
305 | if (check_wd33c93(regs)) | 305 | if (check_wd33c93(regs)) |
306 | goto release; | 306 | goto release; |
307 | 307 | ||
@@ -399,7 +399,7 @@ static struct scsi_host_template driver_template = { | |||
399 | int gvp11_release(struct Scsi_Host *instance) | 399 | int gvp11_release(struct Scsi_Host *instance) |
400 | { | 400 | { |
401 | #ifdef MODULE | 401 | #ifdef MODULE |
402 | gvp11_scsiregs *regs = (gvp11_scsiregs *)(instance->base); | 402 | struct gvp11_scsiregs *regs = (struct gvp11_scsiregs *)(instance->base); |
403 | 403 | ||
404 | regs->CNTR = 0; | 404 | regs->CNTR = 0; |
405 | release_mem_region(ZTWO_PADDR(instance->base), 256); | 405 | release_mem_region(ZTWO_PADDR(instance->base), 256); |