Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/ata/libata-core.c

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

drivers/ata/libata-scsi.c

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

include/linux/libata.h

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

}