From 900e8d6b871a986f5adfa0e71112b8b9face177e Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 4 Apr 2010 11:00:31 +0200 Subject: [PATCH] [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 Cc: Ralf Baechle Signed-off-by: James Bottomley --- drivers/scsi/a2091.c | 2 -- drivers/scsi/a3000.c | 2 -- drivers/scsi/gvp11.c | 2 -- drivers/scsi/mvme147.c | 2 -- drivers/scsi/wd33c93.c | 6 ------ drivers/scsi/wd33c93.h | 1 - 6 files changed, 15 deletions(-) diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index d8fe5b7..e89064d 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) unregister: scsi_unregister(instance); - wd33c93_release(); release: release_mem_region(address, 256); } @@ -242,7 +241,6 @@ static int a2091_release(struct Scsi_Host *instance) DMA(instance)->CNTR = 0; release_mem_region(ZTWO_PADDR(instance->base), 256); free_irq(IRQ_AMIGA_PORTS, instance); - wd33c93_release(); #endif return 1; } diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index c35fc55..2915684 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) return 1; fail_irq: - wd33c93_release(); scsi_unregister(a3000_host); fail_register: release_mem_region(0xDD0000, 256); @@ -237,7 +236,6 @@ static struct scsi_host_template driver_template = { static int a3000_release(struct Scsi_Host *instance) { - wd33c93_release(); DMA(instance)->CNTR = 0; release_mem_region(0xDD0000, 256); free_irq(IRQ_AMIGA_PORTS, a3000_intr); diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c index 48f4068..322afcc 100644 --- a/drivers/scsi/gvp11.c +++ b/drivers/scsi/gvp11.c @@ -339,7 +339,6 @@ int __init gvp11_detect(struct scsi_host_template *tpnt) unregister: scsi_unregister(instance); - wd33c93_release(); release: release_mem_region(address, 256); } @@ -392,7 +391,6 @@ int gvp11_release(struct Scsi_Host *instance) DMA(instance)->CNTR = 0; release_mem_region(ZTWO_PADDR(instance->base), 256); free_irq(IRQ_AMIGA_PORTS, instance); - wd33c93_release(); #endif return 1; } diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c index d722235..a423fcc 100644 --- a/drivers/scsi/mvme147.c +++ b/drivers/scsi/mvme147.c @@ -108,7 +108,6 @@ int mvme147_detect(struct scsi_host_template *tpnt) err_free_irq: free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); err_unregister: - wd33c93_release(); scsi_unregister(mvme147_host); err_out: return 0; @@ -155,7 +154,6 @@ int mvme147_release(struct Scsi_Host *instance) { #ifdef MODULE /* XXX Make sure DMA is stopped! */ - wd33c93_release(); free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); free_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr); #endif diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index 5fda881..b701bf2 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 } -void -wd33c93_release(void) -{ -} - EXPORT_SYMBOL(wd33c93_host_reset); EXPORT_SYMBOL(wd33c93_init); -EXPORT_SYMBOL(wd33c93_release); EXPORT_SYMBOL(wd33c93_abort); EXPORT_SYMBOL(wd33c93_queuecommand); EXPORT_SYMBOL(wd33c93_intr); diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h index 00123f2..1ed5f3b 100644 --- a/drivers/scsi/wd33c93.h +++ b/drivers/scsi/wd33c93.h @@ -348,6 +348,5 @@ int wd33c93_queuecommand (struct scsi_cmnd *cmd, void wd33c93_intr (struct Scsi_Host *instance); int wd33c93_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int); int wd33c93_host_reset (struct scsi_cmnd *); -void wd33c93_release(void); #endif /* WD33C93_H */ -- 2.7.4