ide: remove CONFIG_IDEDISK_MULTI_MODE

Use multi PIO by default when available and remove no longer
needed CONFIG_IDEDISK_MULTI_MODE (it should be safe nowadays,
despite to what help entry has been saying).

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

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 8cfce50c71e4..9926e12783bb 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -89,16 +89,14 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
         u8 max_multsect = id[ATA_ID_MAX_MULTSECT] & 0xff;
 
         if (max_multsect) {
-#ifdef CONFIG_IDEDISK_MULTI_MODE
                 if ((max_multsect / 2) > 1)
                         id[ATA_ID_MULTSECT] = max_multsect | 0x100;
                 else
                         id[ATA_ID_MULTSECT] &= ~0x1ff;
 
                 drive->mult_req = id[ATA_ID_MULTSECT] & 0xff;
-#endif
-                if ((id[ATA_ID_MULTSECT] & 0x100) &&
-                    (id[ATA_ID_MULTSECT] & 0xff))
+
+                if (drive->mult_req)
                         drive->special.b.set_multmode = 1;
         }
 }