Skip to contentSkip to conversation

ide: export ide_allocate_dma_engine()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Mar 8, 2008 – Mar 9, 2008 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 5/7 ide: export ide_allocate_dma_engine()

Export ide_allocate_dma_engine() and use it in trm290 host driver.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-dma.c    |    3 ++-
 drivers/ide/pci/trm290.c |    9 ++-------
 include/linux/ide.h      |    3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/ide/ide-dma.c +2 -1
Index: b/drivers/ide/ide-dma.c
===================================================================
@@ -821,7 +821,7 @@ void ide_release_dma_engine(ide_hwif_t *
 	}
 }
 
-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_h
 
 	return 1;
 }
+EXPORT_SYMBOL_GPL(ide_allocate_dma_engine);
 
 void ide_setup_dma(ide_hwif_t *hwif, unsigned long base)
 {
drivers/ide/pci/trm290.c +2 -7
Index: b/drivers/ide/pci/trm290.c
===================================================================
@@ -254,16 +254,11 @@ static void __devinit init_hwif_trm290(i
 	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 */
include/linux/ide.h +2 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1157,7 +1157,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);