Commit 2e2cc676 authored by Jens Axboe's avatar Jens Axboe Committed by Tejun Heo

libata: use ata_tag_internal() consistently

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: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent e3ed8939
...@@ -759,7 +759,7 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, ...@@ -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 |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
tf->flags |= tf_flags; 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 */ /* yay, NCQ */
if (!lba_48_ok(block, n_block)) if (!lba_48_ok(block, n_block))
return -ERANGE; return -ERANGE;
......
...@@ -5120,7 +5120,7 @@ int ata_sas_allocate_tag(struct ata_port *ap) ...@@ -5120,7 +5120,7 @@ int ata_sas_allocate_tag(struct ata_port *ap)
tag = tag < max_queue ? tag : 0; tag = tag < max_queue ? tag : 0;
/* the last tag is reserved for internal command. */ /* the last tag is reserved for internal command. */
if (tag == ATA_TAG_INTERNAL) if (ata_tag_internal(tag))
continue; continue;
if (!test_and_set_bit(tag, &ap->sas_tag_allocated)) { if (!test_and_set_bit(tag, &ap->sas_tag_allocated)) {
......
...@@ -1491,7 +1491,7 @@ static inline unsigned int ata_tag_valid(unsigned int tag) ...@@ -1491,7 +1491,7 @@ static inline unsigned int ata_tag_valid(unsigned int tag)
return (tag < ATA_MAX_QUEUE) ? 1 : 0; 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; return tag == ATA_TAG_INTERNAL;
} }
......
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