Commit e00923c5 authored by Damien Le Moal's avatar Damien Le Moal

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: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 614065ab
...@@ -719,7 +719,7 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, ...@@ -719,7 +719,7 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
if (tf->flags & ATA_TFLAG_FUA) if (tf->flags & ATA_TFLAG_FUA)
tf->device |= 1 << 7; tf->device |= 1 << 7;
if (dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLE && if (dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLED &&
class == IOPRIO_CLASS_RT) class == IOPRIO_CLASS_RT)
tf->hob_nsect |= ATA_PRIO_HIGH << ATA_SHIFT_PRIO; tf->hob_nsect |= ATA_PRIO_HIGH << ATA_SHIFT_PRIO;
} else if (dev->flags & ATA_DFLAG_LBA) { } else if (dev->flags & ATA_DFLAG_LBA) {
...@@ -2171,7 +2171,7 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) ...@@ -2171,7 +2171,7 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev)
return; return;
not_supported: not_supported:
dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE; dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLED;
dev->flags &= ~ATA_DFLAG_NCQ_PRIO; dev->flags &= ~ATA_DFLAG_NCQ_PRIO;
} }
......
...@@ -870,7 +870,7 @@ static ssize_t ata_ncq_prio_enable_show(struct device *device, ...@@ -870,7 +870,7 @@ static ssize_t ata_ncq_prio_enable_show(struct device *device,
if (!dev) if (!dev)
rc = -ENODEV; rc = -ENODEV;
else 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); spin_unlock_irq(ap->lock);
return rc ? rc : sysfs_emit(buf, "%u\n", ncq_prio_enable); 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, ...@@ -905,9 +905,9 @@ static ssize_t ata_ncq_prio_enable_store(struct device *device,
} }
if (input) if (input)
dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLE; dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLED;
else else
dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE; dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLED;
unlock: unlock:
spin_unlock_irq(ap->lock); spin_unlock_irq(ap->lock);
......
...@@ -101,7 +101,7 @@ enum { ...@@ -101,7 +101,7 @@ enum {
ATA_DFLAG_UNLOCK_HPA = (1 << 18), /* unlock HPA */ ATA_DFLAG_UNLOCK_HPA = (1 << 18), /* unlock HPA */
ATA_DFLAG_NCQ_SEND_RECV = (1 << 19), /* device supports NCQ SEND and RECV */ 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 = (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_INIT_MASK = (1 << 24) - 1,
ATA_DFLAG_DETACH = (1 << 24), ATA_DFLAG_DETACH = (1 << 24),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment