diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-10 15:41:42 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-19 13:38:55 -0400 |
commit | 360ff7833098e944e5003618b03894251e937802 (patch) | |
tree | aaa8c8f771cf35b2a0dab58ea6bad35d88f4ac8a /drivers/ata/sata_nv.c | |
parent | f60d70113fa04e32aee2dedbf304a48469c9c45c (diff) |
libata-sff: separate out BMDMA qc_issue
Separate out ata_bmdma_qc_issue() from ata_sff_qc_issue() such that
ata_sff_qc_issue() only deals with non-BMDMA SFF protocols (PIO and
nodata) while ata_bmdma_qc_issue() deals with the BMDMA protocols and
uses ata_sff_qc_issue() for non-DMA commands. All the users are
updated accordingly.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 4863a62c3d8c..baa8f0d2c86f 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -1468,7 +1468,7 @@ static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc) | |||
1468 | BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) && | 1468 | BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) && |
1469 | (qc->flags & ATA_QCFLAG_DMAMAP)); | 1469 | (qc->flags & ATA_QCFLAG_DMAMAP)); |
1470 | nv_adma_register_mode(qc->ap); | 1470 | nv_adma_register_mode(qc->ap); |
1471 | return ata_sff_qc_issue(qc); | 1471 | return ata_bmdma_qc_issue(qc); |
1472 | } else | 1472 | } else |
1473 | nv_adma_mode(qc->ap); | 1473 | nv_adma_mode(qc->ap); |
1474 | 1474 | ||
@@ -2088,7 +2088,7 @@ static unsigned int nv_swncq_qc_issue(struct ata_queued_cmd *qc) | |||
2088 | struct nv_swncq_port_priv *pp = ap->private_data; | 2088 | struct nv_swncq_port_priv *pp = ap->private_data; |
2089 | 2089 | ||
2090 | if (qc->tf.protocol != ATA_PROT_NCQ) | 2090 | if (qc->tf.protocol != ATA_PROT_NCQ) |
2091 | return ata_sff_qc_issue(qc); | 2091 | return ata_bmdma_qc_issue(qc); |
2092 | 2092 | ||
2093 | DPRINTK("Enter\n"); | 2093 | DPRINTK("Enter\n"); |
2094 | 2094 | ||