aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2010-04-04 05:00:31 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-05-02 15:54:15 -0400
commit900e8d6b871a986f5adfa0e71112b8b9face177e (patch)
tree55785a7eeb5eda031de8aa68447bee6d3a9534d3
parent6e51f085f64a79c7647e88a8a019b7bd84f42255 (diff)
[SCSI] wd33c93: Kill empty wd33c93_release()
wd33c93_release() has been empty since ages, and sgiwd93.c no longer calls it since its conversion to a proper platform driver 2 years ago. Also remove the callers in the m68k wd33c93 shims. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/a2091.c2
-rw-r--r--drivers/scsi/a3000.c2
-rw-r--r--drivers/scsi/gvp11.c2
-rw-r--r--drivers/scsi/mvme147.c2
-rw-r--r--drivers/scsi/wd33c93.c6
-rw-r--r--drivers/scsi/wd33c93.h1
6 files changed, 0 insertions, 15 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index d8fe5b76fee0..e89064dc8cb0 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -193,7 +193,6 @@ static int __init a2091_detect(struct scsi_host_template *tpnt)
193 193
194unregister: 194unregister:
195 scsi_unregister(instance); 195 scsi_unregister(instance);
196 wd33c93_release();
197release: 196release:
198 release_mem_region(address, 256); 197 release_mem_region(address, 256);
199 } 198 }
@@ -242,7 +241,6 @@ static int a2091_release(struct Scsi_Host *instance)
242 DMA(instance)->CNTR = 0; 241 DMA(instance)->CNTR = 0;
243 release_mem_region(ZTWO_PADDR(instance->base), 256); 242 release_mem_region(ZTWO_PADDR(instance->base), 256);
244 free_irq(IRQ_AMIGA_PORTS, instance); 243 free_irq(IRQ_AMIGA_PORTS, instance);
245 wd33c93_release();
246#endif 244#endif
247 return 1; 245 return 1;
248} 246}
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index c35fc55f1c96..291568442aa9 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -193,7 +193,6 @@ static int __init a3000_detect(struct scsi_host_template *tpnt)
193 return 1; 193 return 1;
194 194
195fail_irq: 195fail_irq:
196 wd33c93_release();
197 scsi_unregister(a3000_host); 196 scsi_unregister(a3000_host);
198fail_register: 197fail_register:
199 release_mem_region(0xDD0000, 256); 198 release_mem_region(0xDD0000, 256);
@@ -237,7 +236,6 @@ static struct scsi_host_template driver_template = {
237 236
238static int a3000_release(struct Scsi_Host *instance) 237static int a3000_release(struct Scsi_Host *instance)
239{ 238{
240 wd33c93_release();
241 DMA(instance)->CNTR = 0; 239 DMA(instance)->CNTR = 0;
242 release_mem_region(0xDD0000, 256); 240 release_mem_region(0xDD0000, 256);
243 free_irq(IRQ_AMIGA_PORTS, a3000_intr); 241 free_irq(IRQ_AMIGA_PORTS, a3000_intr);
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 48f406850c65..322afcc99e25 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -339,7 +339,6 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
339 339
340unregister: 340unregister:
341 scsi_unregister(instance); 341 scsi_unregister(instance);
342 wd33c93_release();
343release: 342release:
344 release_mem_region(address, 256); 343 release_mem_region(address, 256);
345 } 344 }
@@ -392,7 +391,6 @@ int gvp11_release(struct Scsi_Host *instance)
392 DMA(instance)->CNTR = 0; 391 DMA(instance)->CNTR = 0;
393 release_mem_region(ZTWO_PADDR(instance->base), 256); 392 release_mem_region(ZTWO_PADDR(instance->base), 256);
394 free_irq(IRQ_AMIGA_PORTS, instance); 393 free_irq(IRQ_AMIGA_PORTS, instance);
395 wd33c93_release();
396#endif 394#endif
397 return 1; 395 return 1;
398} 396}
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index d722235111a8..a423fcc7c11a 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -108,7 +108,6 @@ int mvme147_detect(struct scsi_host_template *tpnt)
108 err_free_irq: 108 err_free_irq:
109 free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); 109 free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr);
110 err_unregister: 110 err_unregister:
111 wd33c93_release();
112 scsi_unregister(mvme147_host); 111 scsi_unregister(mvme147_host);
113 err_out: 112 err_out:
114 return 0; 113 return 0;
@@ -155,7 +154,6 @@ int mvme147_release(struct Scsi_Host *instance)
155{ 154{
156#ifdef MODULE 155#ifdef MODULE
157 /* XXX Make sure DMA is stopped! */ 156 /* XXX Make sure DMA is stopped! */
158 wd33c93_release();
159 free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); 157 free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr);
160 free_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr); 158 free_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr);
161#endif 159#endif
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 5fda881c2470..b701bf2cc187 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -2224,14 +2224,8 @@ wd33c93_proc_info(struct Scsi_Host *instance, char *buf, char **start, off_t off
2224 2224
2225} 2225}
2226 2226
2227void
2228wd33c93_release(void)
2229{
2230}
2231
2232EXPORT_SYMBOL(wd33c93_host_reset); 2227EXPORT_SYMBOL(wd33c93_host_reset);
2233EXPORT_SYMBOL(wd33c93_init); 2228EXPORT_SYMBOL(wd33c93_init);
2234EXPORT_SYMBOL(wd33c93_release);
2235EXPORT_SYMBOL(wd33c93_abort); 2229EXPORT_SYMBOL(wd33c93_abort);
2236EXPORT_SYMBOL(wd33c93_queuecommand); 2230EXPORT_SYMBOL(wd33c93_queuecommand);
2237EXPORT_SYMBOL(wd33c93_intr); 2231EXPORT_SYMBOL(wd33c93_intr);
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h
index 00123f2383d7..1ed5f3bf388e 100644
--- a/drivers/scsi/wd33c93.h
+++ b/drivers/scsi/wd33c93.h
@@ -348,6 +348,5 @@ int wd33c93_queuecommand (struct scsi_cmnd *cmd,
348void wd33c93_intr (struct Scsi_Host *instance); 348void wd33c93_intr (struct Scsi_Host *instance);
349int wd33c93_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int); 349int wd33c93_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
350int wd33c93_host_reset (struct scsi_cmnd *); 350int wd33c93_host_reset (struct scsi_cmnd *);
351void wd33c93_release(void);
352 351
353#endif /* WD33C93_H */ 352#endif /* WD33C93_H */