diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 22:25:21 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 22:25:21 +0200 |
| commit | 23658f8af3dbba53ae9796e4c37c2fdd0272662e (patch) | |
| tree | 32b7efcd41555308709b80866611a35866debc92 | |
| parent | alim15x3: skip DMA initialization completely on revs < 0x20 (diff) | |
| download | linux-23658f8af3dbba53ae9796e4c37c2fdd0272662e.tar.xz linux-23658f8af3dbba53ae9796e4c37c2fdd0272662e.zip | |
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>
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 1 | ||||
| -rw-r--r-- | drivers/ide/pci/hpt366.c | 2 | ||||
| -rw-r--r-- | drivers/ide/setup-pci.c | 7 |
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index fcd0222ca477..fbb55fa2d067 100644 --- 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 0f313f54fc27..df45098157f6 100644 --- 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 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); |