diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:21 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:21 -0400 |
commit | 63158d5c217e2e62665ae9b10d203bd7da817108 (patch) | |
tree | dc98e5f2b66d26f6aeb8405e8c47ea49ea784f1a /drivers/ide/ide-dma.c | |
parent | d54452fbf84500eff77a55a2061f4669441d2cc3 (diff) |
ide: cleanup ide_setup_dma()
* There is no need to call ide_release_dma_engine().
* Move the code up to (and including) ide_allocate_dma_engine()
call to the callers of ide_setup_dma().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ca7f974a71f5..366bbc841fc9 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -841,19 +841,6 @@ EXPORT_SYMBOL_GPL(ide_allocate_dma_engine); | |||
841 | 841 | ||
842 | void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) | 842 | void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) |
843 | { | 843 | { |
844 | if (hwif->mmio) | ||
845 | printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name); | ||
846 | else | ||
847 | printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n", | ||
848 | hwif->name, base, base + 7); | ||
849 | |||
850 | hwif->extra_base = base + (hwif->channel ? 8 : 16); | ||
851 | |||
852 | if (ide_allocate_dma_engine(hwif)) { | ||
853 | ide_release_dma_engine(hwif); | ||
854 | return; | ||
855 | } | ||
856 | |||
857 | hwif->dma_base = base; | 844 | hwif->dma_base = base; |
858 | 845 | ||
859 | if (!hwif->dma_command) | 846 | if (!hwif->dma_command) |