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

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

drivers/ata/libata-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/ata/libata-sata.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -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),