Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
  ide: add support for SCSI ioctls to ide-floppy
  ide: remove stale changelog from setup-pci.c
  ide: remove stale changelog/comments/TODO from ide.c
  ide-cris: handle PIO auto-tuning in tune_cris_ide()
  ide: add PIO masks
  ide: remove ide_find_best_pio_mode()
  ide: drop "PIO data" argument from ide_get_best_pio_mode()
  ide: ide_find_best_pio_mode() fixes (take 2)
  ide: add ide_pio_cycle_time() helper (take 2)
  sc1200: remove stale Power Management code
  ide: ide_start_power_step() fix WRT disabling DMA
  serverworks: fix DMA
  serverworks: always tune PIO
  ide: add ide_pci_device_t.host_flags (take 2)
  ide: add ide_dev_has_iordy() helper (take 4)
  ide: make ide_get_best_pio_mode() print info if overriding PIO mode
  siimage: PIO mode setup fixes (take 2)
  atiixp: PIO mode setup fixes
  ide: Stop mapping ROMs
  IDE: Remove references to dead ETRAX-related variables.
  ...

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index df17ed68c0bc..9b9c4761cb7d 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -115,13 +115,12 @@ static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio)
         int time1, time2;
         u8 param1, param2, param3, param4;
         unsigned long flags;
-        ide_pio_data_t d;
         int bus_speed = system_bus_clock();
 
-        pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO, &d);
+        pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO);
 
         /* calculate timing, according to PIO mode */
-        time1 = d.cycle_time;
+        time1 = ide_pio_cycle_time(drive, pio);
         time2 = ide_pio_timings[pio].active_time;
         param3 = param1 = (time2 * bus_speed + 999) / 1000;
         param4 = param2 = (time1 * bus_speed + 999) / 1000 - param1;
@@ -212,10 +211,12 @@ static int __init ali14xx_probe(void)
         mate = &ide_hwifs[1];
 
         hwif->chipset = ide_ali14xx;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = &ali14xx_tune_drive;
         hwif->mate = mate;
 
         mate->chipset = ide_ali14xx;
+        mate->pio_mask = ATA_PIO4;
         mate->tuneproc = &ali14xx_tune_drive;
         mate->mate = hwif;
         mate->channel = 1;