ide: move ide_setup_dma() call out from ->init_dma method

There should be no functional changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 26997648bf00..f8fc9727da07 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -361,11 +361,10 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
                         }
                 }
                 if (dma_base) {
-                        if (d->init_dma) {
+                        if (d->init_dma)
                                 d->init_dma(hwif, dma_base);
-                        } else {
-                                ide_setup_dma(hwif, dma_base);
-                        }
+
+                        ide_setup_dma(hwif, dma_base);
                 } else {
                         printk(KERN_INFO "%s: %s Bus-Master DMA disabled "
                                 "(BIOS)\n", hwif->name, d->name);