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/dma/ioat | |
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/dma/ioat')
-rw-r--r-- | drivers/dma/ioat/dma.c | 3 | ||||
-rw-r--r-- | drivers/dma/ioat/dma_v3.c | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index c123e32dbbb0..6fcf741ad91b 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c | |||
@@ -818,8 +818,7 @@ int ioat_dma_self_test(struct ioatdma_device *device) | |||
818 | 818 | ||
819 | dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE); | 819 | dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE); |
820 | dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE); | 820 | dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE); |
821 | flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP | | 821 | flags = DMA_PREP_INTERRUPT; |
822 | DMA_PREP_INTERRUPT; | ||
823 | tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src, | 822 | tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src, |
824 | IOAT_TEST_SIZE, flags); | 823 | IOAT_TEST_SIZE, flags); |
825 | if (!tx) { | 824 | if (!tx) { |
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index 43386c171bba..a4798f0cc225 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c | |||
@@ -1279,9 +1279,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) | |||
1279 | DMA_TO_DEVICE); | 1279 | DMA_TO_DEVICE); |
1280 | tx = dma->device_prep_dma_xor(dma_chan, dest_dma, dma_srcs, | 1280 | tx = dma->device_prep_dma_xor(dma_chan, dest_dma, dma_srcs, |
1281 | IOAT_NUM_SRC_TEST, PAGE_SIZE, | 1281 | IOAT_NUM_SRC_TEST, PAGE_SIZE, |
1282 | DMA_PREP_INTERRUPT | | 1282 | DMA_PREP_INTERRUPT); |
1283 | DMA_COMPL_SKIP_SRC_UNMAP | | ||
1284 | DMA_COMPL_SKIP_DEST_UNMAP); | ||
1285 | 1283 | ||
1286 | if (!tx) { | 1284 | if (!tx) { |
1287 | dev_err(dev, "Self-test xor prep failed\n"); | 1285 | dev_err(dev, "Self-test xor prep failed\n"); |
@@ -1342,9 +1340,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) | |||
1342 | DMA_TO_DEVICE); | 1340 | DMA_TO_DEVICE); |
1343 | tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs, | 1341 | tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs, |
1344 | IOAT_NUM_SRC_TEST + 1, PAGE_SIZE, | 1342 | IOAT_NUM_SRC_TEST + 1, PAGE_SIZE, |
1345 | &xor_val_result, DMA_PREP_INTERRUPT | | 1343 | &xor_val_result, DMA_PREP_INTERRUPT); |
1346 | DMA_COMPL_SKIP_SRC_UNMAP | | ||
1347 | DMA_COMPL_SKIP_DEST_UNMAP); | ||
1348 | if (!tx) { | 1344 | if (!tx) { |
1349 | dev_err(dev, "Self-test zero prep failed\n"); | 1345 | dev_err(dev, "Self-test zero prep failed\n"); |
1350 | err = -ENODEV; | 1346 | err = -ENODEV; |
@@ -1389,9 +1385,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) | |||
1389 | DMA_TO_DEVICE); | 1385 | DMA_TO_DEVICE); |
1390 | tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs, | 1386 | tx = dma->device_prep_dma_xor_val(dma_chan, dma_srcs, |
1391 | IOAT_NUM_SRC_TEST + 1, PAGE_SIZE, | 1387 | IOAT_NUM_SRC_TEST + 1, PAGE_SIZE, |
1392 | &xor_val_result, DMA_PREP_INTERRUPT | | 1388 | &xor_val_result, DMA_PREP_INTERRUPT); |
1393 | DMA_COMPL_SKIP_SRC_UNMAP | | ||
1394 | DMA_COMPL_SKIP_DEST_UNMAP); | ||
1395 | if (!tx) { | 1389 | if (!tx) { |
1396 | dev_err(dev, "Self-test 2nd zero prep failed\n"); | 1390 | dev_err(dev, "Self-test 2nd zero prep failed\n"); |
1397 | err = -ENODEV; | 1391 | err = -ENODEV; |