ide-atapi: remove ide-scsi remnants from ide_transfer_pc()

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

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index ff6b567c019981cf05b0b7fa2d7fcd237b00b03f..f5bf405c36aa9a1f2bcf9f73d98d17154e626cec 100644 (file)
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -550,8 +550,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
        }
 
        ireason = ide_read_ireason(drive);
-       if (drive->media == ide_tape &&
-           (drive->dev_flags & IDE_DFLAG_SCSI) == 0)
+       if (drive->media == ide_tape)
                ireason = ide_wait_ireason(drive, ireason);
 
        if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {
@@ -569,14 +568,9 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
                timeout = drive->pc_delay;
                expiry = &ide_delayed_transfer_pc;
        } else {
-               if (drive->dev_flags & IDE_DFLAG_SCSI) {
-                       timeout = ide_scsi_get_timeout(pc);
-                       expiry = ide_scsi_expiry;
-               } else {
-                       timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD
-                                                              : WAIT_TAPE_CMD;
-                       expiry = NULL;
-               }
+               timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD
+                                                      : WAIT_TAPE_CMD;
+               expiry = NULL;
        }
 
        /* Set the interrupt routine */