sl82c105: add PIO autotune fallback to ->ide_dma_check

[linux-2.6-omap-h63xx.git] / drivers / ide / pci / triflex.c

diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 801314fe3524e622da3cafb5576d10bb08f40745..54e411d4e56cfe5d2c538c85946b1651828fb1d4 100644 (file)
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -40,7 +40,7 @@
 #include <linux/ide.h>
 #include <linux/init.h>
 
-static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
+static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
 {
        ide_hwif_t *hwif = HWIF(drive);
        struct pci_dev *dev = hwif->pci_dev;
@@ -48,7 +48,6 @@ static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
        u16 timing = 0;
        u32 triflex_timings = 0;
        u8 unit = (drive->select.b.unit & 0x01);
-       u8 speed = ide_rate_filter(drive, xferspeed);
        
        pci_read_config_dword(dev, channel_offset, &triflex_timings);
        
@@ -83,21 +82,18 @@ static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
                        timing = 0x0808;
                        break;
                default:
-                       return -1;
+                       return;
        }
 
        triflex_timings &= ~(0xFFFF << (16 * unit));
        triflex_timings |= (timing << (16 * unit));
        
        pci_write_config_dword(dev, channel_offset, triflex_timings);
-       
-       return (ide_config_drive_speed(drive, speed));
 }
 
-static void triflex_tune_drive(ide_drive_t *drive, u8 pio)
+static void triflex_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-       int use_pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
-       (void) triflex_tune_chipset(drive, (XFER_PIO_0 + use_pio));
+       triflex_set_mode(drive, XFER_PIO_0 + pio);
 }
 
 static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
@@ -105,15 +101,18 @@ static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
        if (ide_tune_dma(drive))
                return 0;
 
-       triflex_tune_drive(drive, 255);
+       ide_set_max_pio(drive);
 
        return -1;
 }
 
 static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
 {
-       hwif->tuneproc = &triflex_tune_drive;
-       hwif->speedproc = &triflex_tune_chipset;
+       hwif->set_pio_mode = &triflex_set_pio_mode;
+       hwif->set_dma_mode = &triflex_set_mode;
+
+       if (hwif->dma_base == 0)
+               return;
 
        hwif->atapi_dma  = 1;
        hwif->mwdma_mask = 0x07;
@@ -132,6 +131,7 @@ static ide_pci_device_t triflex_device __devinitdata = {
        .autodma        = AUTODMA,
        .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
        .bootable       = ON_BOARD,
+       .pio_mask       = ATA_PIO4,
 };
 
 static int __devinit triflex_init_one(struct pci_dev *dev,