Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e8d5a3 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ide_setup_dma() 



Export sff_dma_ops and then remove ide_setup_dma().

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent cab7f8ed

drivers/ide/arm/palm_bk3710.c

+3 −4
Original line number Diff line number Diff line
@@ -316,15 +316,14 @@ static u8 __devinit palm_bk3710_cable_detect(ide_hwif_t *hwif) 
static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif,

					  const struct ide_port_info *d)

{

	unsigned long base =

		hwif->io_ports.data_addr - IDE_PALM_ATA_PRI_REG_OFFSET;



	printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);



	if (ide_allocate_dma_engine(hwif))

		return -1;



	ide_setup_dma(hwif, base);

	hwif->dma_base = hwif->io_ports.data_addr - IDE_PALM_ATA_PRI_REG_OFFSET;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}

drivers/ide/ide-dma.c

+2 −10
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ int ide_allocate_dma_engine(ide_hwif_t *hwif) 
}

EXPORT_SYMBOL_GPL(ide_allocate_dma_engine);



static const struct ide_dma_ops sff_dma_ops = {

const struct ide_dma_ops sff_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,
@@ -888,13 +888,5 @@ static const struct ide_dma_ops sff_dma_ops = { 
	.dma_timeout		= ide_dma_timeout,

	.dma_lost_irq		= ide_dma_lost_irq,

};



void ide_setup_dma(ide_hwif_t *hwif, unsigned long base)

{

	hwif->dma_base = base;



	hwif->dma_ops = &sff_dma_ops;

}



EXPORT_SYMBOL_GPL(ide_setup_dma);

EXPORT_SYMBOL_GPL(sff_dma_ops);

#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */

drivers/ide/pci/alim15x3.c

+3 −1
Original line number Diff line number Diff line
@@ -483,7 +483,9 @@ static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, 
	if (ide_allocate_dma_engine(hwif))

		return -1;



	ide_setup_dma(hwif, base);

	hwif->dma_base = base;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}

drivers/ide/pci/hpt366.c

+3 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,9 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif, 
	if (ide_allocate_dma_engine(hwif))

		return -1;



	ide_setup_dma(hwif, base);

	hwif->dma_base = base;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}

drivers/ide/setup-pci.c

+3 −1
Original line number Diff line number Diff line
@@ -377,7 +377,9 @@ int ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d) 
		if (ide_allocate_dma_engine(hwif))

			return -1;



		ide_setup_dma(hwif, base);

		hwif->dma_base = base;



		hwif->dma_ops = &sff_dma_ops;

	}



	return 0;