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>

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index fcd0222..fbb55fa 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -734,7 +734,6 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
 {
        if (!hwif->channel)
                outb(inb(dmabase + 2) & 0x60, dmabase + 2);
-       ide_setup_dma(hwif, dmabase);
 }
 
 static const struct ide_port_ops ali_port_ops = {

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 0f313f5..df45098 100644 (file)
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1348,8 +1348,6 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
                outb(dma_new, dmabase + 2);
 
        local_irq_restore(flags);
-
-       ide_setup_dma(hwif, dmabase);
 }
 
 static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 2699764..f8fc972 100644 (file)
--- 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);