diff options
Diffstat (limited to 'drivers/scsi/a3000.c')
-rw-r--r-- | drivers/scsi/a3000.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index f425d424bf08..7bf46d40b561 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c | |||
@@ -44,7 +44,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy, struct pt_regs *fp) | |||
44 | return IRQ_NONE; | 44 | return IRQ_NONE; |
45 | } | 45 | } |
46 | 46 | ||
47 | static int dma_setup (Scsi_Cmnd *cmd, int dir_in) | 47 | static int dma_setup(struct scsi_cmnd *cmd, int dir_in) |
48 | { | 48 | { |
49 | unsigned short cntr = CNTR_PDMD | CNTR_INTEN; | 49 | unsigned short cntr = CNTR_PDMD | CNTR_INTEN; |
50 | unsigned long addr = virt_to_bus(cmd->SCp.ptr); | 50 | unsigned long addr = virt_to_bus(cmd->SCp.ptr); |
@@ -110,8 +110,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in) | |||
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, | 113 | static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, |
114 | int status) | 114 | int status) |
115 | { | 115 | { |
116 | /* disable SCSI interrupts */ | 116 | /* disable SCSI interrupts */ |
117 | unsigned short cntr = CNTR_PDMD; | 117 | unsigned short cntr = CNTR_PDMD; |
@@ -190,7 +190,7 @@ int __init a3000_detect(struct scsi_host_template *tpnt) | |||
190 | regs.SASR = &(DMA(a3000_host)->SASR); | 190 | regs.SASR = &(DMA(a3000_host)->SASR); |
191 | regs.SCMD = &(DMA(a3000_host)->SCMD); | 191 | regs.SCMD = &(DMA(a3000_host)->SCMD); |
192 | wd33c93_init(a3000_host, regs, dma_setup, dma_stop, WD33C93_FS_12_15); | 192 | wd33c93_init(a3000_host, regs, dma_setup, dma_stop, WD33C93_FS_12_15); |
193 | if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, SA_SHIRQ, "A3000 SCSI", | 193 | if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, IRQF_SHARED, "A3000 SCSI", |
194 | a3000_intr)) | 194 | a3000_intr)) |
195 | goto fail_irq; | 195 | goto fail_irq; |
196 | DMA(a3000_host)->CNTR = CNTR_PDMD | CNTR_INTEN; | 196 | DMA(a3000_host)->CNTR = CNTR_PDMD | CNTR_INTEN; |
@@ -205,7 +205,7 @@ fail_register: | |||
205 | return 0; | 205 | return 0; |
206 | } | 206 | } |
207 | 207 | ||
208 | static int a3000_bus_reset(Scsi_Cmnd *cmd) | 208 | static int a3000_bus_reset(struct scsi_cmnd *cmd) |
209 | { | 209 | { |
210 | /* FIXME perform bus-specific reset */ | 210 | /* FIXME perform bus-specific reset */ |
211 | 211 | ||