Commit 23658f8a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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



There should be no functional changes caused by this patch.
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6d36b95f
...@@ -734,7 +734,6 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) ...@@ -734,7 +734,6 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
{ {
if (!hwif->channel) if (!hwif->channel)
outb(inb(dmabase + 2) & 0x60, dmabase + 2); outb(inb(dmabase + 2) & 0x60, dmabase + 2);
ide_setup_dma(hwif, dmabase);
} }
static const struct ide_port_ops ali_port_ops = { static const struct ide_port_ops ali_port_ops = {
......
...@@ -1348,8 +1348,6 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase) ...@@ -1348,8 +1348,6 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
outb(dma_new, dmabase + 2); outb(dma_new, dmabase + 2);
local_irq_restore(flags); local_irq_restore(flags);
ide_setup_dma(hwif, dmabase);
} }
static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
......
...@@ -361,11 +361,10 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d) ...@@ -361,11 +361,10 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
} }
} }
if (dma_base) { if (dma_base) {
if (d->init_dma) { if (d->init_dma)
d->init_dma(hwif, dma_base); d->init_dma(hwif, dma_base);
} else {
ide_setup_dma(hwif, dma_base); ide_setup_dma(hwif, dma_base);
}
} else { } else {
printk(KERN_INFO "%s: %s Bus-Master DMA disabled " printk(KERN_INFO "%s: %s Bus-Master DMA disabled "
"(BIOS)\n", hwif->name, d->name); "(BIOS)\n", hwif->name, d->name);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment