ide: use per-port IRQ handlers

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-dma-sff.c

diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c
index cac431f0df1769eda7e4f2d7fe28d7f8914602db..f6d2d44d8a9a78f5714ad05ca0c080b089e416be 100644 (file)
--- a/drivers/ide/ide-dma-sff.c
+++ b/drivers/ide/ide-dma-sff.c
@@ -98,10 +98,10 @@ int ide_build_dmatable(ide_drive_t *drive, struct request *rq)
 {
        ide_hwif_t *hwif = drive->hwif;
        __le32 *table = (__le32 *)hwif->dmatable_cpu;
-       unsigned int is_trm290  = (hwif->chipset == ide_trm290) ? 1 : 0;
        unsigned int count = 0;
        int i;
        struct scatterlist *sg;
+       u8 is_trm290 = !!(hwif->host_flags & IDE_HFLAG_TRM290);
 
        hwif->sg_nents = ide_build_sglist(drive, rq);
        if (hwif->sg_nents == 0)
@@ -176,15 +176,10 @@ int ide_dma_setup(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = drive->hwif;
        struct request *rq = hwif->hwgroup->rq;
-       unsigned int reading;
+       unsigned int reading = rq_data_dir(rq) ? 0 : ATA_DMA_WR;
        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
        u8 dma_stat;
 
-       if (rq_data_dir(rq))
-               reading = 0;
-       else
-               reading = 1 << 3;
-
        /* fall back to pio! */
        if (!ide_build_dmatable(drive, rq)) {
                ide_map_sg(drive, rq);
@@ -209,10 +204,11 @@ int ide_dma_setup(ide_drive_t *drive)
 
        /* clear INTR & ERROR flags */
        if (mmio)
-               writeb(dma_stat | 6,
+               writeb(dma_stat | ATA_DMA_ERR | ATA_DMA_INTR,
                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
        else
-               outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
+               outb(dma_stat | ATA_DMA_ERR | ATA_DMA_INTR,
+                    hwif->dma_base + ATA_DMA_STATUS);
 
        drive->waiting_for_dma = 1;
        return 0;
@@ -246,14 +242,13 @@ static int dma_timer_expiry(ide_drive_t *drive)
 
        hwif->hwgroup->expiry = NULL;   /* one free ride for now */
 
-       /* 1 dmaing, 2 error, 4 intr */
-       if (dma_stat & 2)       /* ERROR */
+       if (dma_stat & ATA_DMA_ERR)     /* ERROR */
                return -1;
 
-       if (dma_stat & 1)       /* DMAing */
+       if (dma_stat & ATA_DMA_ACTIVE)  /* DMAing */
                return WAIT_CMD;
 
-       if (dma_stat & 4)       /* Got an Interrupt */
+       if (dma_stat & ATA_DMA_INTR)    /* Got an Interrupt */
                return WAIT_CMD;
 
        return 0;       /* Status is unknown -- reset the bus */
@@ -279,12 +274,11 @@ void ide_dma_start(ide_drive_t *drive)
         */
        if (hwif->host_flags & IDE_HFLAG_MMIO) {
                dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-               /* start DMA */
-               writeb(dma_cmd | 1,
+               writeb(dma_cmd | ATA_DMA_START,
                       (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
        } else {
                dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
-               outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD);
+               outb(dma_cmd | ATA_DMA_START, hwif->dma_base + ATA_DMA_CMD);
        }
 
        wmb();
@@ -296,19 +290,18 @@ int ide_dma_end(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = drive->hwif;
        u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
-       u8 dma_stat = 0, dma_cmd = 0;
+       u8 dma_stat = 0, dma_cmd = 0, mask;
 
        drive->waiting_for_dma = 0;
 
+       /* stop DMA */
        if (mmio) {
-               /* get DMA command mode */
                dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
-               /* stop DMA */
-               writeb(dma_cmd & ~1,
+               writeb(dma_cmd & ~ATA_DMA_START,
                       (void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
        } else {
                dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
-               outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD);
+               outb(dma_cmd & ~ATA_DMA_START, hwif->dma_base + ATA_DMA_CMD);
        }
 
        /* get DMA status */
@@ -316,16 +309,21 @@ int ide_dma_end(ide_drive_t *drive)
 
        if (mmio)
                /* clear the INTR & ERROR bits */
-               writeb(dma_stat | 6,
+               writeb(dma_stat | ATA_DMA_ERR | ATA_DMA_INTR,
                       (void __iomem *)(hwif->dma_base + ATA_DMA_STATUS));
        else
-               outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
+               outb(dma_stat | ATA_DMA_ERR | ATA_DMA_INTR,
+                    hwif->dma_base + ATA_DMA_STATUS);
 
        /* purge DMA mappings */
        ide_destroy_dmatable(drive);
-       /* verify good DMA status */
        wmb();
-       return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
+
+       /* verify good DMA status */
+       mask = ATA_DMA_ACTIVE | ATA_DMA_ERR | ATA_DMA_INTR;
+       if ((dma_stat & mask) != ATA_DMA_INTR)
+               return 0x10 | dma_stat;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(ide_dma_end);
 
@@ -335,11 +333,7 @@ int ide_dma_test_irq(ide_drive_t *drive)
        ide_hwif_t *hwif = drive->hwif;
        u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
 
-       /* return 1 if INTR asserted */
-       if ((dma_stat & 4) == 4)
-               return 1;
-
-       return 0;
+       return (dma_stat & ATA_DMA_INTR) ? 1 : 0;
 }
 EXPORT_SYMBOL_GPL(ide_dma_test_irq);