diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-05-11 12:51:06 -0600 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2018-05-11 13:10:43 -0700 |
| commit | 2e2cc676cee8962cdc82a23723df2fb394d35c64 (patch) | |
| tree | b2e65fc638505a6c0def547447639fddd4fb7ddf /drivers/ata | |
| parent | e3ed8939644166a7560a33c46f508584a7f1756a (diff) | |
| download | linux-2e2cc676cee8962cdc82a23723df2fb394d35c64.tar.gz linux-2e2cc676cee8962cdc82a23723df2fb394d35c64.tar.bz2 linux-2e2cc676cee8962cdc82a23723df2fb394d35c64.zip | |
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: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 2 | ||||
| -rw-r--r-- | drivers/ata/libata-scsi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b079c3b5ec27..8fd352d4c190 100644 --- 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 index 28e1af2bae5f..143cdad7d81a 100644 --- 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)) { |