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 /drivers/ide/setup-pci.c | |
| parent | 6d36b95fe2cc5655e96da42eaf19f1aa341c6856 (diff) | |
| download | linux-23658f8af3dbba53ae9796e4c37c2fdd0272662e.tar.gz linux-23658f8af3dbba53ae9796e4c37c2fdd0272662e.tar.bz2 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>
Diffstat (limited to 'drivers/ide/setup-pci.c')
| -rw-r--r-- | drivers/ide/setup-pci.c | 7 |
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); |