diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:19 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:19 -0400 |
commit | 0d1bad216c43bcee84cc24d1ed003c19134d2645 (patch) | |
tree | 3cdcf7592c4e1a8899cde78beb512bffa21abf77 /drivers/ide/ide.c | |
parent | 7ebe5936c214c656a1625abf9ec3b09e3d1bf34a (diff) |
ide: manage resources for PCI devices in ide_pci_enable() (take 3)
* Reserve PCI BARs 0-3 (0-1 for single port controllers) in
ide_pci_enable() and remove ide_hwif_request_regions() call
from ide_device_add_all() (also cleanup resource management
in scc_pata host driver).
* Fix handling of PCI BAR 4 in ide_pci_enable(), then cleanup
ide_iomio_dma() (+ init_hwif_trm290() in trm290 host driver)
and remove ide_release[_iomio]_dma().
v2:
* Fixup trm290 host driver.
v3:
* Because of scc_pata host driver changes we need to call
pci_request_selected_regions() also in setup_mmio_scc().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 629383dd37db..694d997ce50f 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -413,7 +413,7 @@ void ide_unregister(unsigned int index) | |||
413 | spin_lock_irq(&ide_lock); | 413 | spin_lock_irq(&ide_lock); |
414 | 414 | ||
415 | if (hwif->dma_base) | 415 | if (hwif->dma_base) |
416 | (void)ide_release_dma(hwif); | 416 | ide_release_dma_engine(hwif); |
417 | 417 | ||
418 | /* restore hwif data to pristine status */ | 418 | /* restore hwif data to pristine status */ |
419 | ide_init_port_data(hwif, index); | 419 | ide_init_port_data(hwif, index); |