diff options
author | Tejun Heo <htejun@gmail.com> | 2007-12-18 16:34:43 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-01-23 05:24:14 -0500 |
commit | 0dc36888d4422140f9eaf50f24953ec109f750a3 (patch) | |
tree | 80253b1831849e4063b73c31c15011c5e4c48404 /drivers/ata/pata_pdc202xx_old.c | |
parent | 537b53c1692960b8b3b0324e886fbe48cb9e5c00 (diff) |
libata: rename ATA_PROT_ATAPI_* to ATAPI_PROT_*
ATA_PROT_ATAPI_* are ugly and naming schemes between ATA_PROT_* and
ATA_PROT_ATAPI_* are inconsistent causing confusion. Rename them to
ATAPI_PROT_* and make them consistent with ATA counterpart.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_pdc202xx_old.c')
-rw-r--r-- | drivers/ata/pata_pdc202xx_old.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c index 6c9689b59b06..3ed866723e0c 100644 --- a/drivers/ata/pata_pdc202xx_old.c +++ b/drivers/ata/pata_pdc202xx_old.c | |||
@@ -168,8 +168,7 @@ static void pdc2026x_bmdma_start(struct ata_queued_cmd *qc) | |||
168 | pdc202xx_set_dmamode(ap, qc->dev); | 168 | pdc202xx_set_dmamode(ap, qc->dev); |
169 | 169 | ||
170 | /* Cases the state machine will not complete correctly without help */ | 170 | /* Cases the state machine will not complete correctly without help */ |
171 | if ((tf->flags & ATA_TFLAG_LBA48) || tf->protocol == ATA_PROT_ATAPI_DMA) | 171 | if ((tf->flags & ATA_TFLAG_LBA48) || tf->protocol == ATAPI_PROT_DMA) { |
172 | { | ||
173 | len = qc->nbytes / 2; | 172 | len = qc->nbytes / 2; |
174 | 173 | ||
175 | if (tf->flags & ATA_TFLAG_WRITE) | 174 | if (tf->flags & ATA_TFLAG_WRITE) |
@@ -208,7 +207,7 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc) | |||
208 | void __iomem *atapi_reg = master + 0x20 + (4 * ap->port_no); | 207 | void __iomem *atapi_reg = master + 0x20 + (4 * ap->port_no); |
209 | 208 | ||
210 | /* Cases the state machine will not complete correctly */ | 209 | /* Cases the state machine will not complete correctly */ |
211 | if (tf->protocol == ATA_PROT_ATAPI_DMA || ( tf->flags & ATA_TFLAG_LBA48)) { | 210 | if (tf->protocol == ATAPI_PROT_DMA || (tf->flags & ATA_TFLAG_LBA48)) { |
212 | iowrite32(0, atapi_reg); | 211 | iowrite32(0, atapi_reg); |
213 | iowrite8(ioread8(clock) & ~sel66, clock); | 212 | iowrite8(ioread8(clock) & ~sel66, clock); |
214 | } | 213 | } |