libata: use ATA_ID_CFA_*

Use ATA_ID_CFA_* constants for CFA specific identify data words 162 and 163.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index a61af3818c84..17c5d48a75d2 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1656,8 +1656,8 @@ unsigned long ata_id_xfermask(const u16 *id)
                 /*
                  *      Process compact flash extended modes
                  */
-                int pio = id[163] & 0x7;
-                int dma = (id[163] >> 3) & 7;
+                int pio = (id[ATA_ID_CFA_MODES] >> 0) & 0x7;
+                int dma = (id[ATA_ID_CFA_MODES] >> 3) & 0x7;
 
                 if (pio)
                         pio_mask |= (1 << 5);
@@ -2426,7 +2426,8 @@ int ata_dev_configure(struct ata_device *dev)
         /* ATA-specific feature tests */
         if (dev->class == ATA_DEV_ATA) {
                 if (ata_id_is_cfa(id)) {
-                        if (id[162] & 1) /* CPRM may make this media unusable */
+                        /* CPRM may make this media unusable */
+                        if (id[ATA_ID_CFA_KEY_MGMT] & 1)
                                 ata_dev_printk(dev, KERN_WARNING,
                                                "supports DRM functions and may "
                                                "not be fully accessable.\n");