ata: libata: Rename ATA_DFLAG_NCQ_PRIO_ENABLE

Rename ATA_DFLAG_NCQ_PRIO_ENABLE to ATA_DFLAG_NCQ_PRIO_ENABLED to match
the fact that this flags indicates if NCQ priority use is enabled by the
user.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 0ba0e692210f4db69210020e4e11a2277f0a693e..a5c51da1063805a5668267a3a2d3db65a7dca4d6 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -719,7 +719,7 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                if (tf->flags & ATA_TFLAG_FUA)
                        tf->device |= 1 << 7;
 
-               if (dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLE &&
+               if (dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLED &&
                    class == IOPRIO_CLASS_RT)
                        tf->hob_nsect |= ATA_PRIO_HIGH << ATA_SHIFT_PRIO;
        } else if (dev->flags & ATA_DFLAG_LBA) {
@@ -2171,7 +2171,7 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev)
        return;
 
 not_supported:
-       dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE;
+       dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLED;
        dev->flags &= ~ATA_DFLAG_NCQ_PRIO;
 }
 

diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c
index 7a5fe41aa5ae10eda99cf10c3f8d895de4995f3c..eef57d101ed13a99528677c0299b8c7290a28de4 100644 (file)
--- a/drivers/ata/libata-sata.c
+++ b/drivers/ata/libata-sata.c
@@ -870,7 +870,7 @@ static ssize_t ata_ncq_prio_enable_show(struct device *device,
        if (!dev)
                rc = -ENODEV;
        else
-               ncq_prio_enable = dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLE;
+               ncq_prio_enable = dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLED;
        spin_unlock_irq(ap->lock);
 
        return rc ? rc : sysfs_emit(buf, "%u\n", ncq_prio_enable);
@@ -905,9 +905,9 @@ static ssize_t ata_ncq_prio_enable_store(struct device *device,
        }
 
        if (input)
-               dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLE;
+               dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLED;
        else
-               dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE;
+               dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLED;
 
 unlock:
        spin_unlock_irq(ap->lock);

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0269ff114f5a7abbccf366f17973c5407f780ada..a505cfb92ab33be012c7e69930d64777feb60674 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -101,7 +101,7 @@ enum {
        ATA_DFLAG_UNLOCK_HPA    = (1 << 18), /* unlock HPA */
        ATA_DFLAG_NCQ_SEND_RECV = (1 << 19), /* device supports NCQ SEND and RECV */
        ATA_DFLAG_NCQ_PRIO      = (1 << 20), /* device supports NCQ priority */
-       ATA_DFLAG_NCQ_PRIO_ENABLE = (1 << 21), /* Priority cmds sent to dev */
+       ATA_DFLAG_NCQ_PRIO_ENABLED = (1 << 21), /* Priority cmds sent to dev */
        ATA_DFLAG_INIT_MASK     = (1 << 24) - 1,
 
        ATA_DFLAG_DETACH        = (1 << 24),