diff options
| author |   Borislav Petkov <petkovbb@googlemail.com> | 2009-01-02 16:12:53 +0100 |
|---|---|---|
| committer |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-02 16:12:53 +0100 |
| commit | 5fe3110431ccf437607bdc11ac3677bf3eeee6e3 (patch) | |
| tree | d340f0d5fd6abe6b8ec9bb395c647f7bf75a76a2 /drivers/ide/ide-atapi.c | |
| parent | ide-atapi: remove ide-scsi remnants from ide_issue_pc (diff) | |
| download | linux-dev-5fe3110431ccf437607bdc11ac3677bf3eeee6e3.tar.xz linux-dev-5fe3110431ccf437607bdc11ac3677bf3eeee6e3.zip | |
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>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
| -rw-r--r-- | drivers/ide/ide-atapi.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index ff6b567c0199..f5bf405c36aa 100644 --- 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 */ |