1 files changed, 10 insertions, 12 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 7031a8dcf692..c859de77aa8f 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -274,16 +274,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
                 if (overridden)
                         printk(KERN_INFO "%s: tPIO > 2, assuming tPIO = 2\n",
                                          drive->name);
-
-                /*
-                 * Conservative "downgrade" for all pre-ATA2 drives
-                 */
-                if ((drive->hwif->host_flags & IDE_HFLAG_PIO_NO_DOWNGRADE) == 0 &&
-                    pio_mode && pio_mode < 4) {
-                        pio_mode--;
-                        printk(KERN_INFO "%s: applying conservative "
-                                         "PIO \"downgrade\"\n", drive->name);
-                }
         }
 
         if (pio_mode > max_mode)
@@ -300,7 +290,8 @@ void ide_set_pio(ide_drive_t *drive, u8 req_pio)
         ide_hwif_t *hwif = drive->hwif;
         u8 host_pio, pio;
 
-        if (hwif->set_pio_mode == NULL)
+        if (hwif->set_pio_mode == NULL ||
+            (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
                 return;
 
         BUG_ON(hwif->pio_mask == 0x00);
@@ -353,6 +344,9 @@ int ide_set_pio_mode(ide_drive_t *drive, const u8 mode)
 {
         ide_hwif_t *hwif = drive->hwif;
 
+        if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
+                return 0;
+
         if (hwif->set_pio_mode == NULL)
                 return -1;
 
@@ -380,6 +374,9 @@ int ide_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
         ide_hwif_t *hwif = drive->hwif;
 
+        if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
+                return 0;
+
         if (hwif->set_dma_mode == NULL)
                 return -1;
 
@@ -410,7 +407,8 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 {
         ide_hwif_t *hwif = drive->hwif;
 
-        if (hwif->set_dma_mode == NULL)
+        if (hwif->set_dma_mode == NULL ||
+            (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
                 return -1;
 
         rate = ide_rate_filter(drive, rate);