Revert "tty: fix a little bug in scrup, vt.c"

[safe/jmp/linux-2.6] / drivers / ide / cmd64x.c

diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index 5c5dd90..5f80312 100644 (file)
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -88,9 +88,6 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode)
        pci_write_config_byte(dev, drwtim_regs[drive->dn],
                              (t.active << 4) | t.recover);
 
-       if (mode >= XFER_SW_DMA_0)
-               return;
-
        /*
         * The primary channel has individual address setup timing registers
         * for each drive and the hardware selects the slowest timing itself.
@@ -100,11 +97,17 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode)
        if (hwif->channel) {
                ide_drive_t *pair = ide_get_pair_dev(drive);
 
-               ide_set_drivedata(drive, (void *)(unsigned long)t.setup);
+               if (pair) {
+                       struct ide_timing tp;
 
-               if (pair)
-                       t.setup = max_t(u8, t.setup,
-                                       (unsigned long)ide_get_drivedata(pair));
+                       ide_timing_compute(pair, pair->pio_mode, &tp, T, 0);
+                       ide_timing_merge(&t, &tp, &t, IDE_TIMING_SETUP);
+                       if (pair->dma_mode) {
+                               ide_timing_compute(pair, pair->dma_mode,
+                                               &tp, T, 0);
+                               ide_timing_merge(&tp, &t, &t, IDE_TIMING_SETUP);
+                       }
+               }
        }
 
        if (t.setup > 5)                /* shouldn't actually happen... */
@@ -127,8 +130,10 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode)
  * Special cases are 8: prefetch off, 9: prefetch on (both never worked)
  */
 
-static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio)
+static void cmd64x_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
+       const u8 pio = drive->pio_mode - XFER_PIO_0;
+
        /*
         * Filter out the prefetch control values
         * to prevent PIO5 from being programmed
@@ -139,17 +144,15 @@ static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio)
        cmd64x_program_timings(drive, XFER_PIO_0 + pio);
 }
 
-static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed)
+static void cmd64x_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-       ide_hwif_t *hwif        = drive->hwif;
        struct pci_dev *dev     = to_pci_dev(hwif->dev);
        u8 unit                 = drive->dn & 0x01;
        u8 regU = 0, pciU       = hwif->channel ? UDIDETCR1 : UDIDETCR0;
+       const u8 speed          = drive->dma_mode;
 
-       if (speed >= XFER_SW_DMA_0) {
-               (void) pci_read_config_byte(dev, pciU, &regU);
-               regU &= ~(unit ? 0xCA : 0x35);
-       }
+       pci_read_config_byte(dev, pciU, &regU);
+       regU &= ~(unit ? 0xCA : 0x35);
 
        switch(speed) {
        case XFER_UDMA_5:
@@ -177,8 +180,7 @@ static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed)
                break;
        }
 
-       if (speed >= XFER_SW_DMA_0)
-               (void) pci_write_config_byte(dev, pciU, regU);
+       pci_write_config_byte(dev, pciU, regU);
 }
 
 static void cmd648_clear_irq(ide_drive_t *drive)