diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:21 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:21 -0400 |
commit | 3a7d24841ad794ae64c90d7d00d62a83741912aa (patch) | |
tree | d71a36678fa88ed1e0b279390b6169f5018186bf /drivers/ide/ide-tape.c | |
parent | f26b3d75959e9a0e43a2e1e1148c075592746c3d (diff) |
ide: use ATA_* defines instead of *_STAT and *_ERR ones
* ERR_STAT -> ATA_ERR
* INDEX_STAT -> ATA_IDX
* ECC_STAT -> ATA_CORR
* DRQ_STAT -> ATA_DRQ
* SEEK_STAT -> ATA_DSC
* WRERR_STAT -> ATA_DF
* READY_STAT -> ATA_DRDY
* BUSY_STAT -> ATA_BUSY
* MARK_ERR -> ATA_AMNF
* TRK0_ERR -> ATA_TRK0NF
* ABRT_ERR -> ATA_ABORTED
* MCR_ERR -> ATA_MCR
* ID_ERR -> ATA_IDNF
* MC_ERR -> ATA_MC
* ECC_ERR -> ATA_UNC
* ICRC_ERR -> ATA_ICRC
* BBD_ERR -> ATA_BBK
Also:
* ILI_ERR -> ATAPI_ILI
* EOM_ERR -> ATAPI_EOM
* LFS_ERR -> ATAPI_LFS
* CD -> ATAPI_COD
* IO -> ATAPI_IO
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 2c4c6674db61..2745e5d26848 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -920,8 +920,8 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) | |||
920 | 920 | ||
921 | stat = hwif->tp_ops->read_status(hwif); | 921 | stat = hwif->tp_ops->read_status(hwif); |
922 | 922 | ||
923 | if (stat & SEEK_STAT) { | 923 | if (stat & ATA_DSC) { |
924 | if (stat & ERR_STAT) { | 924 | if (stat & ATA_ERR) { |
925 | /* Error detected */ | 925 | /* Error detected */ |
926 | if (pc->c[0] != TEST_UNIT_READY) | 926 | if (pc->c[0] != TEST_UNIT_READY) |
927 | printk(KERN_ERR "ide-tape: %s: I/O error, ", | 927 | printk(KERN_ERR "ide-tape: %s: I/O error, ", |
@@ -1022,7 +1022,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, | |||
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | if (!test_and_clear_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags) && | 1024 | if (!test_and_clear_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags) && |
1025 | (stat & SEEK_STAT) == 0) { | 1025 | (stat & ATA_DSC) == 0) { |
1026 | if (postponed_rq == NULL) { | 1026 | if (postponed_rq == NULL) { |
1027 | tape->dsc_polling_start = jiffies; | 1027 | tape->dsc_polling_start = jiffies; |
1028 | tape->dsc_poll_freq = tape->best_dsc_rw_freq; | 1028 | tape->dsc_poll_freq = tape->best_dsc_rw_freq; |