diff options
| author | Hannes Reinecke <hare@suse.de> | 2016-07-14 09:05:43 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-07-14 10:44:57 -0400 |
| commit | 179b310ae77ea4f924fe338af5c8983c3f339098 (patch) | |
| tree | 5b08dec2296ee5c829a4a751535b50d16ce4cb6a /drivers/ata | |
| parent | b1c04e80c6da5f5d3d4778ede23c59666135fdeb (diff) | |
| download | linux-0-day-179b310ae77ea4f924fe338af5c8983c3f339098.tar.gz linux-0-day-179b310ae77ea4f924fe338af5c8983c3f339098.tar.xz | |
libata: use ata_is_ncq() accessors
Use accessor functions instead of the raw value.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libahci.c | 2 | ||||
| -rw-r--r-- | drivers/ata/libata-core.c | 4 | ||||
| -rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 71b07198e207d..3e69c20e9d037 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1975,7 +1975,7 @@ unsigned int ahci_qc_issue(struct ata_queued_cmd *qc) */ pp->active_link = qc->dev->link; - if (qc->tf.protocol == ATA_PROT_NCQ) + if (ata_is_ncq(qc->tf.protocol)) writel(1 << qc->tag, port_mmio + PORT_SCR_ACT); if (pp->fbs_enabled && pp->fbs_last_dev != qc->dev->link->pmp) { diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 077daf0d26047..f5eb07e06a2ad 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -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--; diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 3dca0d15c469d..0447a391fb7aa 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3130,8 +3130,8 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc) tf->command = cdb[9]; } - /* For NCQ commands with FPDMA protocol, copy the tag value */ - if (tf->protocol == ATA_PROT_NCQ) + /* For NCQ commands copy the tag value */ + if (ata_is_ncq(tf->protocol)) tf->nsect = qc->tag << 3; /* enforce correct master/slave bit */ |