diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2013-10-18 13:35:33 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2013-11-14 14:04:38 -0500 |
commit | 0776ae7b89782124ddd72eafe0b1e0fdcdabe32e (patch) | |
tree | f16e917b66a8a60a7341937a40021d683f3e27f0 /drivers/ntb | |
parent | 54f8d501e842879143e867e70996574a54d1e130 (diff) |
dmaengine: remove DMA unmap flags
Remove no longer needed DMA unmap flags:
- DMA_COMPL_SKIP_SRC_UNMAP
- DMA_COMPL_SKIP_DEST_UNMAP
- DMA_COMPL_SRC_UNMAP_SINGLE
- DMA_COMPL_DEST_UNMAP_SINGLE
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Jon Mason <jon.mason@intel.com>
Acked-by: Mark Brown <broonie@linaro.org>
[djbw: clean up straggling skip unmap flags in ntb]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/ntb')
-rw-r--r-- | drivers/ntb/ntb_transport.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 222c2baa3a4b..d0222f13d154 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c | |||
@@ -1037,7 +1037,6 @@ static void ntb_async_rx(struct ntb_queue_entry *entry, void *offset, | |||
1037 | struct dmaengine_unmap_data *unmap; | 1037 | struct dmaengine_unmap_data *unmap; |
1038 | dma_cookie_t cookie; | 1038 | dma_cookie_t cookie; |
1039 | void *buf = entry->buf; | 1039 | void *buf = entry->buf; |
1040 | unsigned long flags; | ||
1041 | 1040 | ||
1042 | entry->len = len; | 1041 | entry->len = len; |
1043 | 1042 | ||
@@ -1073,10 +1072,9 @@ static void ntb_async_rx(struct ntb_queue_entry *entry, void *offset, | |||
1073 | 1072 | ||
1074 | unmap->from_cnt = 1; | 1073 | unmap->from_cnt = 1; |
1075 | 1074 | ||
1076 | flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP | | ||
1077 | DMA_PREP_INTERRUPT; | ||
1078 | txd = device->device_prep_dma_memcpy(chan, unmap->addr[1], | 1075 | txd = device->device_prep_dma_memcpy(chan, unmap->addr[1], |
1079 | unmap->addr[0], len, flags); | 1076 | unmap->addr[0], len, |
1077 | DMA_PREP_INTERRUPT); | ||
1080 | if (!txd) | 1078 | if (!txd) |
1081 | goto err_get_unmap; | 1079 | goto err_get_unmap; |
1082 | 1080 | ||
@@ -1266,7 +1264,6 @@ static void ntb_async_tx(struct ntb_transport_qp *qp, | |||
1266 | void __iomem *offset; | 1264 | void __iomem *offset; |
1267 | size_t len = entry->len; | 1265 | size_t len = entry->len; |
1268 | void *buf = entry->buf; | 1266 | void *buf = entry->buf; |
1269 | unsigned long flags; | ||
1270 | 1267 | ||
1271 | offset = qp->tx_mw + qp->tx_max_frame * qp->tx_index; | 1268 | offset = qp->tx_mw + qp->tx_max_frame * qp->tx_index; |
1272 | hdr = offset + qp->tx_max_frame - sizeof(struct ntb_payload_header); | 1269 | hdr = offset + qp->tx_max_frame - sizeof(struct ntb_payload_header); |
@@ -1301,10 +1298,8 @@ static void ntb_async_tx(struct ntb_transport_qp *qp, | |||
1301 | 1298 | ||
1302 | unmap->to_cnt = 1; | 1299 | unmap->to_cnt = 1; |
1303 | 1300 | ||
1304 | flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP | | ||
1305 | DMA_PREP_INTERRUPT; | ||
1306 | txd = device->device_prep_dma_memcpy(chan, dest, unmap->addr[0], len, | 1301 | txd = device->device_prep_dma_memcpy(chan, dest, unmap->addr[0], len, |
1307 | flags); | 1302 | DMA_PREP_INTERRUPT); |
1308 | if (!txd) | 1303 | if (!txd) |
1309 | goto err_get_unmap; | 1304 | goto err_get_unmap; |
1310 | 1305 | ||