aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/a2091.c6
-rw-r--r--drivers/scsi/a2091.h4
-rw-r--r--drivers/scsi/a3000.c8
-rw-r--r--drivers/scsi/a3000.h4
-rw-r--r--drivers/scsi/gvp11.c8
-rw-r--r--drivers/scsi/gvp11.h4
-rw-r--r--drivers/scsi/mvme147.c6
-rw-r--r--drivers/scsi/mvme147.h4
-rw-r--r--drivers/scsi/sgiwd93.c8
9 files changed, 18 insertions, 34 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index fddfa2ebcd70..085406928605 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -40,7 +40,7 @@ static irqreturn_t a2091_intr (int irq, void *_instance, struct pt_regs *fp)
40 return IRQ_HANDLED; 40 return IRQ_HANDLED;
41} 41}
42 42
43static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 43static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
44{ 44{
45 unsigned short cntr = CNTR_PDMD | CNTR_INTEN; 45 unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
46 unsigned long addr = virt_to_bus(cmd->SCp.ptr); 46 unsigned long addr = virt_to_bus(cmd->SCp.ptr);
@@ -115,7 +115,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
115 return 0; 115 return 0;
116} 116}
117 117
118static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 118static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
119 int status) 119 int status)
120{ 120{
121 /* disable SCSI interrupts */ 121 /* disable SCSI interrupts */
@@ -217,7 +217,7 @@ int __init a2091_detect(struct scsi_host_template *tpnt)
217 return num_a2091; 217 return num_a2091;
218} 218}
219 219
220static int a2091_bus_reset(Scsi_Cmnd *cmd) 220static int a2091_bus_reset(struct scsi_cmnd *cmd)
221{ 221{
222 /* FIXME perform bus-specific reset */ 222 /* FIXME perform bus-specific reset */
223 223
diff --git a/drivers/scsi/a2091.h b/drivers/scsi/a2091.h
index 22d6a13dd8be..fe809bc88d73 100644
--- a/drivers/scsi/a2091.h
+++ b/drivers/scsi/a2091.h
@@ -13,10 +13,6 @@
13 13
14int a2091_detect(struct scsi_host_template *); 14int a2091_detect(struct scsi_host_template *);
15int a2091_release(struct Scsi_Host *); 15int a2091_release(struct Scsi_Host *);
16const char *wd33c93_info(void);
17int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
18int wd33c93_abort(Scsi_Cmnd *);
19int wd33c93_reset(Scsi_Cmnd *, unsigned int);
20 16
21#ifndef CMD_PER_LUN 17#ifndef CMD_PER_LUN
22#define CMD_PER_LUN 2 18#define CMD_PER_LUN 2
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index ae9ab4b136ac..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
47static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 47static 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
113static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 113static 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;
@@ -205,7 +205,7 @@ fail_register:
205 return 0; 205 return 0;
206} 206}
207 207
208static int a3000_bus_reset(Scsi_Cmnd *cmd) 208static int a3000_bus_reset(struct scsi_cmnd *cmd)
209{ 209{
210 /* FIXME perform bus-specific reset */ 210 /* FIXME perform bus-specific reset */
211 211
diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h
index 5535a65150a4..44a4ec7b4650 100644
--- a/drivers/scsi/a3000.h
+++ b/drivers/scsi/a3000.h
@@ -13,10 +13,6 @@
13 13
14int a3000_detect(struct scsi_host_template *); 14int a3000_detect(struct scsi_host_template *);
15int a3000_release(struct Scsi_Host *); 15int a3000_release(struct Scsi_Host *);
16const char *wd33c93_info(void);
17int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
18int wd33c93_abort(Scsi_Cmnd *);
19int wd33c93_reset(Scsi_Cmnd *, unsigned int);
20 16
21#ifndef CMD_PER_LUN 17#ifndef CMD_PER_LUN
22#define CMD_PER_LUN 2 18#define CMD_PER_LUN 2
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index a0d831b1bada..18dbe5c27dac 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -47,7 +47,7 @@ void gvp11_setup (char *str, int *ints)
47 gvp11_xfer_mask = ints[1]; 47 gvp11_xfer_mask = ints[1];
48} 48}
49 49
50static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 50static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
51{ 51{
52 unsigned short cntr = GVP11_DMAC_INT_ENABLE; 52 unsigned short cntr = GVP11_DMAC_INT_ENABLE;
53 unsigned long addr = virt_to_bus(cmd->SCp.ptr); 53 unsigned long addr = virt_to_bus(cmd->SCp.ptr);
@@ -142,8 +142,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
142 return 0; 142 return 0;
143} 143}
144 144
145static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 145static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
146 int status) 146 int status)
147{ 147{
148 /* stop DMA */ 148 /* stop DMA */
149 DMA(instance)->SP_DMA = 1; 149 DMA(instance)->SP_DMA = 1;
@@ -341,7 +341,7 @@ release:
341 return num_gvp11; 341 return num_gvp11;
342} 342}
343 343
344static int gvp11_bus_reset(Scsi_Cmnd *cmd) 344static int gvp11_bus_reset(struct scsi_cmnd *cmd)
345{ 345{
346 /* FIXME perform bus-specific reset */ 346 /* FIXME perform bus-specific reset */
347 347
diff --git a/drivers/scsi/gvp11.h b/drivers/scsi/gvp11.h
index 575d219d14ba..bf22859a5035 100644
--- a/drivers/scsi/gvp11.h
+++ b/drivers/scsi/gvp11.h
@@ -13,10 +13,6 @@
13 13
14int gvp11_detect(struct scsi_host_template *); 14int gvp11_detect(struct scsi_host_template *);
15int gvp11_release(struct Scsi_Host *); 15int gvp11_release(struct Scsi_Host *);
16const char *wd33c93_info(void);
17int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
18int wd33c93_abort(Scsi_Cmnd *);
19int wd33c93_reset(Scsi_Cmnd *, unsigned int);
20 16
21#ifndef CMD_PER_LUN 17#ifndef CMD_PER_LUN
22#define CMD_PER_LUN 2 18#define CMD_PER_LUN 2
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index cb367c2c5c78..9b991b746d1e 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -29,7 +29,7 @@ static irqreturn_t mvme147_intr (int irq, void *dummy, struct pt_regs *fp)
29 return IRQ_HANDLED; 29 return IRQ_HANDLED;
30} 30}
31 31
32static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 32static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
33{ 33{
34 unsigned char flags = 0x01; 34 unsigned char flags = 0x01;
35 unsigned long addr = virt_to_bus(cmd->SCp.ptr); 35 unsigned long addr = virt_to_bus(cmd->SCp.ptr);
@@ -57,7 +57,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
57 return 0; 57 return 0;
58} 58}
59 59
60static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 60static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
61 int status) 61 int status)
62{ 62{
63 m147_pcc->dma_cntrl = 0; 63 m147_pcc->dma_cntrl = 0;
@@ -112,7 +112,7 @@ int mvme147_detect(struct scsi_host_template *tpnt)
112 return 0; 112 return 0;
113} 113}
114 114
115static int mvme147_bus_reset(Scsi_Cmnd *cmd) 115static int mvme147_bus_reset(struct scsi_cmnd *cmd)
116{ 116{
117 /* FIXME perform bus-specific reset */ 117 /* FIXME perform bus-specific reset */
118 118
diff --git a/drivers/scsi/mvme147.h b/drivers/scsi/mvme147.h
index 2f56d69bd180..32aee85434d8 100644
--- a/drivers/scsi/mvme147.h
+++ b/drivers/scsi/mvme147.h
@@ -12,10 +12,6 @@
12 12
13int mvme147_detect(struct scsi_host_template *); 13int mvme147_detect(struct scsi_host_template *);
14int mvme147_release(struct Scsi_Host *); 14int mvme147_release(struct Scsi_Host *);
15const char *wd33c93_info(void);
16int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
17int wd33c93_abort(Scsi_Cmnd *);
18int wd33c93_reset(Scsi_Cmnd *, unsigned int);
19 15
20#ifndef CMD_PER_LUN 16#ifndef CMD_PER_LUN
21#define CMD_PER_LUN 2 17#define CMD_PER_LUN 2
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 7cd366fcc571..4f1db6f2aae8 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -97,7 +97,7 @@ static irqreturn_t sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs)
97} 97}
98 98
99static inline 99static inline
100void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp) 100void fill_hpc_entries(struct hpc_chunk *hcp, struct scsi_cmnd *cmd, int datainp)
101{ 101{
102 unsigned long len = cmd->SCp.this_residual; 102 unsigned long len = cmd->SCp.this_residual;
103 void *addr = cmd->SCp.ptr; 103 void *addr = cmd->SCp.ptr;
@@ -129,7 +129,7 @@ void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp)
129 hcp->desc.cntinfo = HPCDMA_EOX; 129 hcp->desc.cntinfo = HPCDMA_EOX;
130} 130}
131 131
132static int dma_setup(Scsi_Cmnd *cmd, int datainp) 132static int dma_setup(struct scsi_cmnd *cmd, int datainp)
133{ 133{
134 struct ip22_hostdata *hdata = HDATA(cmd->device->host); 134 struct ip22_hostdata *hdata = HDATA(cmd->device->host);
135 struct hpc3_scsiregs *hregs = 135 struct hpc3_scsiregs *hregs =
@@ -163,7 +163,7 @@ static int dma_setup(Scsi_Cmnd *cmd, int datainp)
163 return 0; 163 return 0;
164} 164}
165 165
166static void dma_stop(struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 166static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
167 int status) 167 int status)
168{ 168{
169 struct ip22_hostdata *hdata = HDATA(instance); 169 struct ip22_hostdata *hdata = HDATA(instance);
@@ -305,7 +305,7 @@ static int sgiwd93_release(struct Scsi_Host *instance)
305 return 1; 305 return 1;
306} 306}
307 307
308static int sgiwd93_bus_reset(Scsi_Cmnd *cmd) 308static int sgiwd93_bus_reset(struct scsi_cmnd *cmd)
309{ 309{
310 /* FIXME perform bus-specific reset */ 310 /* FIXME perform bus-specific reset */
311 311