Skip to content

Commit

Permalink
[SCSI] wd33c93: Kill empty wd33c93_release()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and James Bottomley committed May 2, 2010
1 parent 6e51f08 commit 900e8d6
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 15 deletions.
2 changes: 0 additions & 2 deletions drivers/scsi/a2091.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/scsi/a3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions drivers/scsi/gvp11.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/scsi/mvme147.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions drivers/scsi/wd33c93.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/scsi/wd33c93.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 900e8d6

Please sign in to comment.