mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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>
This commit is contained in:
parent
6d36b95fe2
commit
23658f8af3
3 changed files with 3 additions and 7 deletions
|
@ -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 = {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue