diff options
| -rw-r--r-- | drivers/ide/ide-dma.c | 3 | ||||
| -rw-r--r-- | drivers/ide/pci/trm290.c | 9 | ||||
| -rw-r--r-- | include/linux/ide.h | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 1933254660a..ca7f974a71f 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -821,7 +821,7 @@ void ide_release_dma_engine(ide_hwif_t *hwif) } } -static int ide_allocate_dma_engine(ide_hwif_t *hwif) +int ide_allocate_dma_engine(ide_hwif_t *hwif) { struct pci_dev *pdev = to_pci_dev(hwif->dev); @@ -837,6 +837,7 @@ static int ide_allocate_dma_engine(ide_hwif_t *hwif) return 1; } +EXPORT_SYMBOL_GPL(ide_allocate_dma_engine); void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) { diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index 0677ab016ef..7e354d33323 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c @@ -254,16 +254,11 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif) hwif->config_data = cfg_base; hwif->dma_base = (cfg_base + 4) ^ (hwif->channel ? 0x80 : 0); - printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx", + printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name, hwif->dma_base, hwif->dma_base + 3); - hwif->dmatable_cpu = pci_alloc_consistent(dev, PRD_ENTRIES * PRD_BYTES, - &hwif->dmatable_dma); - if (!hwif->dmatable_cpu) { - printk(KERN_CONT " -- Error, unable to allocate DMA table.\n"); + if (ide_allocate_dma_engine(hwif)) return; - } - printk(KERN_CONT "\n"); local_irq_save(flags); /* put config reg into first byte of hwif->select_data */ diff --git a/include/linux/ide.h b/include/linux/ide.h index 989fe78b354..b8a9d3b4d63 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1155,7 +1155,8 @@ void ide_destroy_dmatable(ide_drive_t *); #ifdef CONFIG_BLK_DEV_IDEDMA_SFF extern int ide_build_dmatable(ide_drive_t *, struct request *); -extern void ide_release_dma_engine(ide_hwif_t *); +int ide_allocate_dma_engine(ide_hwif_t *); +void ide_release_dma_engine(ide_hwif_t *); extern void ide_setup_dma(ide_hwif_t *, unsigned long); void ide_dma_host_set(ide_drive_t *, int); |