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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (24 commits)
  ide: use only ->set_pio_mode method for programming PIO modes (take 2)
  sis5513: don't change UDMA settings when programming PIO
  it8213/piix/slc90e66: don't change DMA settings when programming PIO
  alim15x3: PIO mode setup fixes
  siimage: fix ->set_pio_mode method to select PIO data transfer
  cs5520: don't enable VDMA in ->speedproc
  sc1200: remove redundant warning message from sc1200_tune_chipset()
  ide-pmac: PIO mode setup fixes (take 3)
  icside: fix ->speedproc to return on unsupported modes (take 5)
  sgiioc4: use ide_tune_dma()
  amd74xx/via82cxxx: use ide_tune_dma()
  ide: add ide_set{_max}_pio() (take 4)
  ide: Kconfig face-lift
  ide: move ide_rate_filter() calls to the upper layer (take 2)
  sis5513: add ->udma_filter method for chipset_family >= ATA_133
  ide: mode limiting fixes for user requested speed changes
  ide: add missing ide_rate_filter() calls to ->speedproc()-s
  ide: call udma_filter() before resorting to the UltraDMA mask
  ide: make jmicron match vendor and device class
  pdc202xx_new: switch to using pci_get_slot() (take 2)
  ...

1 files changed, 16 insertions, 4 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 5e88a060df06..e96212ce5729 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -396,8 +396,9 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->cds                       = tmp_hwif->cds;
 #endif
 
-        hwif->tuneproc                  = tmp_hwif->tuneproc;
+        hwif->set_pio_mode              = tmp_hwif->set_pio_mode;
         hwif->speedproc                 = tmp_hwif->speedproc;
+        hwif->mdma_filter               = tmp_hwif->mdma_filter;
         hwif->udma_filter               = tmp_hwif->udma_filter;
         hwif->selectproc                = tmp_hwif->selectproc;
         hwif->reset_poll                = tmp_hwif->reset_poll;
@@ -866,8 +867,9 @@ int set_pio_mode(ide_drive_t *drive, int arg)
         if (arg < 0 || arg > 255)
                 return -EINVAL;
 
-        if (!HWIF(drive)->tuneproc)
+        if (drive->hwif->set_pio_mode == NULL)
                 return -ENOSYS;
+
         if (drive->special.b.set_tune)
                 return -EBUSY;
         ide_init_drive_cmd(&rq);
@@ -914,6 +916,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
         struct request rq;
         struct request_pm_state rqpm;
         ide_task_t args;
+        int ret;
 
         /* Call ACPI _GTM only once */
         if (!(drive->dn % 2))
@@ -930,7 +933,14 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
                 mesg.event = PM_EVENT_FREEZE;
         rqpm.pm_state = mesg.event;
 
-        return ide_do_drive_cmd(drive, &rq, ide_wait);
+        ret = ide_do_drive_cmd(drive, &rq, ide_wait);
+        /* only call ACPI _PS3 after both drivers are suspended */
+        if (!ret && (((drive->dn % 2) && hwif->drives[0].present
+                 && hwif->drives[1].present)
+                 || !hwif->drives[0].present
+                 || !hwif->drives[1].present))
+                ide_acpi_set_state(hwif, 0);
+        return ret;
 }
 
 static int generic_ide_resume(struct device *dev)
@@ -943,8 +953,10 @@ static int generic_ide_resume(struct device *dev)
         int err;
 
         /* Call ACPI _STM only once */
-        if (!(drive->dn % 2))
+        if (!(drive->dn % 2)) {
+                ide_acpi_set_state(hwif, 1);
                 ide_acpi_push_timing(hwif);
+        }
 
         ide_acpi_exec_tfs(drive);