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

Commit 653bcf52 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: __ide_dma_end() -> ide_dma_end() 



While at it:
- use EXPORT_SYMBOL_GPL() to match the rest of SFF DMA functions

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

drivers/ide/ide-dma.c

+3 −4
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ void ide_dma_start(ide_drive_t *drive) 
EXPORT_SYMBOL_GPL(ide_dma_start);



/* returns 1 on error, 0 otherwise */

int __ide_dma_end (ide_drive_t *drive)

int ide_dma_end(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
@@ -566,8 +566,7 @@ int __ide_dma_end (ide_drive_t *drive) 
	wmb();

	return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;

}



EXPORT_SYMBOL(__ide_dma_end);

EXPORT_SYMBOL_GPL(ide_dma_end);



/* returns 1 if dma irq issued, 0 otherwise */

int ide_dma_test_irq(ide_drive_t *drive)
@@ -880,7 +879,7 @@ const struct ide_dma_ops sff_dma_ops = { 
	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= __ide_dma_end,

	.dma_end		= ide_dma_end,

	.dma_test_irq		= ide_dma_test_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_lost_irq		= ide_dma_lost_irq,

drivers/ide/pci/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static const struct ide_dma_ops ali_dma_ops = { 
	.dma_setup		= ali15x3_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= __ide_dma_end,

	.dma_end		= ide_dma_end,

	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

drivers/ide/pci/cmd64x.c

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int cmd648_dma_end(ide_drive_t *drive) 
{

	ide_hwif_t *hwif	= HWIF(drive);

	unsigned long base	= hwif->dma_base - (hwif->channel * 8);

	int err			= __ide_dma_end(drive);

	int err			= ide_dma_end(drive);

	u8  irq_mask		= hwif->channel ? MRDMODE_INTR_CH1 :

						  MRDMODE_INTR_CH0;

	u8  mrdmode		= inb(base + 1);
@@ -248,7 +248,7 @@ static int cmd64x_dma_end(ide_drive_t *drive) 
	u8  irq_mask		= hwif->channel ? ARTTIM23_INTR_CH1 :

						  CFR_INTR_CH0;

	u8  irq_stat		= 0;

	int err			= __ide_dma_end(drive);

	int err			= ide_dma_end(drive);



	(void) pci_read_config_byte(dev, irq_reg, &irq_stat);

	/* clear the interrupt bit */

drivers/ide/pci/hpt366.c

+3 −3
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int hpt370_dma_end(ide_drive_t *drive) 
		if (dma_stat & 0x01)

			hpt370_irq_timeout(drive);

	}

	return __ide_dma_end(drive);

	return ide_dma_end(drive);

}



static void hpt370_dma_timeout(ide_drive_t *drive)
@@ -877,7 +877,7 @@ static int hpt374_dma_end(ide_drive_t *drive) 
	pci_read_config_byte(dev, mcr_addr, &mcr);

	if (bwsr & mask)

		pci_write_config_byte(dev, mcr_addr, mcr | 0x30);

	return __ide_dma_end(drive);

	return ide_dma_end(drive);

}



/**
@@ -1453,7 +1453,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = { 
	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= __ide_dma_end,

	.dma_end		= ide_dma_end,

	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= hpt366_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

drivers/ide/pci/it821x.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static int it821x_dma_end(ide_drive_t *drive) 
{

	ide_hwif_t *hwif = drive->hwif;

	struct it821x_dev *itdev = ide_get_hwifdata(hwif);

	int ret = __ide_dma_end(drive);

	int ret = ide_dma_end(drive);

	u8 unit = drive->dn & 1;



	if(itdev->mwdma[unit] != MWDMA_OFF)