ide: convert 'pio_mode' device setting to use DS_SYNC flag

* Convert 'pio_mode' device setting to use DS_SYNC flag.

* Remove unused special_t.b.{set_tune,serviced} and ide_drive_t.tune_req.

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

1 files changed, 5 insertions, 63 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index ecfb87c10097..ec709269c066 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -543,30 +543,6 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
         return ide_started;
 }
 
-/*
- * handle HDIO_SET_PIO_MODE ioctl abusers here, eventually it will go away
- */
-static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)
-{
-        switch (req_pio) {
-        case 202:
-        case 201:
-        case 200:
-        case 102:
-        case 101:
-        case 100:
-                return (hwif->host_flags & IDE_HFLAG_ABUSE_DMA_MODES) ? 1 : 0;
-        case 9:
-        case 8:
-                return (hwif->host_flags & IDE_HFLAG_ABUSE_PREFETCH) ? 1 : 0;
-        case 7:
-        case 6:
-                return (hwif->host_flags & IDE_HFLAG_ABUSE_FAST_DEVSEL) ? 1 : 0;
-        default:
-                return 0;
-        }
-}
-
 /**
  *      do_special              -       issue some special commands
  *      @drive: drive the command is for
@@ -584,46 +560,12 @@ static ide_startstop_t do_special (ide_drive_t *drive)
 #ifdef DEBUG
         printk("%s: do_special: 0x%02x\n", drive->name, s->all);
 #endif
-        if (s->b.set_tune) {
-                ide_hwif_t *hwif = drive->hwif;
-                const struct ide_port_ops *port_ops = hwif->port_ops;
-                u8 req_pio = drive->tune_req;
-
-                s->b.set_tune = 0;
-
-                if (set_pio_mode_abuse(drive->hwif, req_pio)) {
-                        /*
-                         * take ide_lock for IDE_DFLAG_[NO_]UNMASK/[NO_]IO_32BIT
-                         */
-                        if (req_pio == 8 || req_pio == 9) {
-                                unsigned long flags;
-
-                                spin_lock_irqsave(&ide_lock, flags);
-                                port_ops->set_pio_mode(drive, req_pio);
-                                spin_unlock_irqrestore(&ide_lock, flags);
-                        } else
-                                port_ops->set_pio_mode(drive, req_pio);
-                } else {
-                        int keep_dma =
-                                !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
-
-                        ide_set_pio(drive, req_pio);
-
-                        if (hwif->host_flags & IDE_HFLAG_SET_PIO_MODE_KEEP_DMA) {
-                                if (keep_dma)
-                                        ide_dma_on(drive);
-                        }
-                }
-
-                return ide_stopped;
-        } else {
-                if (drive->media == ide_disk)
-                        return ide_disk_special(drive);
+        if (drive->media == ide_disk)
+                return ide_disk_special(drive);
 
-                s->all = 0;
-                drive->mult_req = 0;
-                return ide_stopped;
-        }
+        s->all = 0;
+        drive->mult_req = 0;
+        return ide_stopped;
 }
 
 void ide_map_sg(ide_drive_t *drive, struct request *rq)