diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-05 20:57:51 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-05 20:57:51 -0500 |
commit | c47137a99c597330b69057158b26061a360c0e09 (patch) | |
tree | aacd4cb968b8d7bdebdcbcce19f110469a977243 /drivers/ide/ide-tape.c | |
parent | 29dd59755a849cc6475faa6a75f3b804e23a6fc2 (diff) |
ide: add ide_read_[alt]status() inline helpers
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index bf40d8c824ad..66801c084dd8 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -1178,7 +1178,7 @@ static ide_startstop_t idetape_pc_intr (ide_drive_t *drive) | |||
1178 | #endif /* IDETAPE_DEBUG_LOG */ | 1178 | #endif /* IDETAPE_DEBUG_LOG */ |
1179 | 1179 | ||
1180 | /* Clear the interrupt */ | 1180 | /* Clear the interrupt */ |
1181 | stat = hwif->INB(IDE_STATUS_REG); | 1181 | stat = ide_read_status(drive); |
1182 | 1182 | ||
1183 | if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { | 1183 | if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { |
1184 | if (hwif->ide_dma_end(drive) || (stat & ERR_STAT)) { | 1184 | if (hwif->ide_dma_end(drive) || (stat & ERR_STAT)) { |
@@ -1598,7 +1598,8 @@ static ide_startstop_t idetape_media_access_finished (ide_drive_t *drive) | |||
1598 | idetape_pc_t *pc = tape->pc; | 1598 | idetape_pc_t *pc = tape->pc; |
1599 | u8 stat; | 1599 | u8 stat; |
1600 | 1600 | ||
1601 | stat = drive->hwif->INB(IDE_STATUS_REG); | 1601 | stat = ide_read_status(drive); |
1602 | |||
1602 | if (stat & SEEK_STAT) { | 1603 | if (stat & SEEK_STAT) { |
1603 | if (stat & ERR_STAT) { | 1604 | if (stat & ERR_STAT) { |
1604 | /* Error detected */ | 1605 | /* Error detected */ |
@@ -1758,7 +1759,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, | |||
1758 | * If the tape is still busy, postpone our request and service | 1759 | * If the tape is still busy, postpone our request and service |
1759 | * the other device meanwhile. | 1760 | * the other device meanwhile. |
1760 | */ | 1761 | */ |
1761 | stat = drive->hwif->INB(IDE_STATUS_REG); | 1762 | stat = ide_read_status(drive); |
1762 | 1763 | ||
1763 | if (!drive->dsc_overlap && !(rq->cmd[0] & REQ_IDETAPE_PC2)) | 1764 | if (!drive->dsc_overlap && !(rq->cmd[0] & REQ_IDETAPE_PC2)) |
1764 | set_bit(IDETAPE_IGNORE_DSC, &tape->flags); | 1765 | set_bit(IDETAPE_IGNORE_DSC, &tape->flags); |