|
@@ -4842,7 +4842,7 @@ int ata_std_qc_defer(struct ata_queued_cmd *qc)
|
|
|
{
|
|
|
struct ata_link *link = qc->dev->link;
|
|
|
|
|
|
- if (qc->tf.protocol == ATA_PROT_NCQ) {
|
|
|
+ if (ata_is_ncq(qc->tf.protocol)) {
|
|
|
if (!ata_tag_valid(link->active_tag))
|
|
|
return 0;
|
|
|
} else {
|
|
@@ -5007,7 +5007,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
|
|
|
ata_sg_clean(qc);
|
|
|
|
|
|
/* command should be marked inactive atomically with qc completion */
|
|
|
- if (qc->tf.protocol == ATA_PROT_NCQ) {
|
|
|
+ if (ata_is_ncq(qc->tf.protocol)) {
|
|
|
link->sactive &= ~(1 << qc->tag);
|
|
|
if (!link->sactive)
|
|
|
ap->nr_active_links--;
|