libata: use ata_tag_internal() consistently

axboe · htejun · commit 2e2cc676cee8 · 2018-05-11T13:10:43.000-07:00
Some check for the value directly, use the provided helper instead.
Also make it return a bool, since that's what it does.

Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
Signed-off-by: Tejun Heo &lt;tj@kernel.org&gt;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
@@ -759,7 +759,7 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
 	tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
 	tf->flags |= tf_flags;
 
-	if (ata_ncq_enabled(dev) && likely(tag != ATA_TAG_INTERNAL)) {
+	if (ata_ncq_enabled(dev) && !ata_tag_internal(tag)) {
 		/* yay, NCQ */
 		if (!lba_48_ok(block, n_block))
 			return -ERANGE;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
@@ -5120,7 +5120,7 @@ int ata_sas_allocate_tag(struct ata_port *ap)
 		tag = tag < max_queue ? tag : 0;
 
 		/* the last tag is reserved for internal command. */
-		if (tag == ATA_TAG_INTERNAL)
+		if (ata_tag_internal(tag))
 			continue;
 
 		if (!test_and_set_bit(tag, &ap->sas_tag_allocated)) {
diff --git a/include/linux/libata.h b/include/linux/libata.h
@@ -1491,7 +1491,7 @@ static inline unsigned int ata_tag_valid(unsigned int tag)
 	return (tag < ATA_MAX_QUEUE) ? 1 : 0;
 }
 
-static inline unsigned int ata_tag_internal(unsigned int tag)
+static inline bool ata_tag_internal(unsigned int tag)
 {
 	return tag == ATA_TAG_INTERNAL;
 }

Original file line number	Diff line number	Diff line change
`@@ -1491,7 +1491,7 @@ static inline unsigned int ata_tag_valid(unsigned int tag)`
`1491`	`1491`	`return (tag < ATA_MAX_QUEUE) ? 1 : 0;`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`		`-static inline unsigned int ata_tag_internal(unsigned int tag)`
	`1494`	`+static inline bool ata_tag_internal(unsigned int tag)`
`1495`	`1495`	`{`
`1496`	`1496`	`return tag == ATA_TAG_INTERNAL;`
`1497`	`1497`	`}`