ide: remove PIO "downgrade" quirk

No need for it nowadays so remove quirk code from ide_get_best_pio_mode()
and IDE_HFLAG_PIO_DOWNGRADE host flag.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4 files changed, 0 insertions, 13 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 7031a8dcf692..fa4c194b5ede 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)
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 68517267d31e..ff684d312378 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -219,7 +219,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
 
 #define IDE_HFLAGS_AMD \
         (IDE_HFLAG_PIO_NO_BLACKLIST | \
-         IDE_HFLAG_PIO_NO_DOWNGRADE | \
          IDE_HFLAG_ABUSE_SET_DMA_MODE | \
          IDE_HFLAG_POST_SET_MODE | \
          IDE_HFLAG_IO_32BIT | \
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index b55d2e4d3506..cff3cafedc47 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -429,7 +429,6 @@ static const struct ide_port_info via82cxxx_chipset __devinitdata = {
         .init_hwif      = init_hwif_via82cxxx,
         .enablebits     = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
         .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
-                          IDE_HFLAG_PIO_NO_DOWNGRADE |
                           IDE_HFLAG_ABUSE_SET_DMA_MODE |
                           IDE_HFLAG_POST_SET_MODE |
                           IDE_HFLAG_IO_32BIT,
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 8f4080c73081..177961edc430 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -921,7 +921,6 @@ pmac_ide_do_resume(ide_hwif_t *hwif)
 static const struct ide_port_info pmac_port_info = {
         .chipset                = ide_pmac,
         .host_flags             = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |
                                   IDE_HFLAG_POST_SET_MODE |
                                   IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
                                   IDE_HFLAG_UNMASK_IRQS,