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/pci/scc_pata.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/pci/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 44cccd1e086a..192a6a70a631 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -400,7 +400,7 @@ static int scc_dma_end(ide_drive_t *drive) | |||
400 | /* errata A308 workaround: Step5 (check data loss) */ | 400 | /* errata A308 workaround: Step5 (check data loss) */ |
401 | /* We don't check non ide_disk because it is limited to UDMA4 */ | 401 | /* We don't check non ide_disk because it is limited to UDMA4 */ |
402 | if (!(in_be32((void __iomem *)hwif->io_ports.ctl_addr) | 402 | if (!(in_be32((void __iomem *)hwif->io_ports.ctl_addr) |
403 | & ERR_STAT) && | 403 | & ATA_ERR) && |
404 | drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) { | 404 | drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) { |
405 | reg = in_be32((void __iomem *)intsts_port); | 405 | reg = in_be32((void __iomem *)intsts_port); |
406 | if (!(reg & INTSTS_ACTEINT)) { | 406 | if (!(reg & INTSTS_ACTEINT)) { |
@@ -504,7 +504,7 @@ static int scc_dma_test_irq(ide_drive_t *drive) | |||
504 | 504 | ||
505 | /* SCC errata A252,A308 workaround: Step4 */ | 505 | /* SCC errata A252,A308 workaround: Step4 */ |
506 | if ((in_be32((void __iomem *)hwif->io_ports.ctl_addr) | 506 | if ((in_be32((void __iomem *)hwif->io_ports.ctl_addr) |
507 | & ERR_STAT) && | 507 | & ATA_ERR) && |
508 | (int_stat & INTSTS_INTRQ)) | 508 | (int_stat & INTSTS_INTRQ)) |
509 | return 1; | 509 | return 1; |
510 | 510 | ||