Commit b8e73fba authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: export ide_allocate_dma_engine() 



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

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 23658f8a

drivers/ide/ide-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{

drivers/ide/pci/trm290.c

+2 −7
Original line number Diff line number Diff line
@@ -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 */

include/linux/ide.h

+2 −1
Original line number Diff line number Diff line
@@ -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);