diff options
author | Hongbo Zhang <hongbo.zhang@freescale.com> | 2014-04-18 04:17:46 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-05-02 12:47:42 -0400 |
commit | 867dfa5dfcf4545b73e39ce95bf6abdafacf95bf (patch) | |
tree | 9c3d06e90cdbc1efb33bc4ab7e114e344cc9f348 | |
parent | ccdce9a041185b2ed3009bfe426130eecdf4f551 (diff) |
DMA: Freescale: remove attribute DMA_INTERRUPT of dmaengine
Delete attribute DMA_INTERRUPT because fsldma doesn't support this function,
exception will be thrown if talitos is used to offload xor at the same time.
Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com>
Signed-off-by: Qiang Liu <qiang.liu@freescale.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/dma/fsldma.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 5f32cb8a5767..b71cc04e66ca 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c | |||
@@ -528,35 +528,6 @@ static void fsl_dma_free_chan_resources(struct dma_chan *dchan) | |||
528 | } | 528 | } |
529 | 529 | ||
530 | static struct dma_async_tx_descriptor * | 530 | static struct dma_async_tx_descriptor * |
531 | fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags) | ||
532 | { | ||
533 | struct fsldma_chan *chan; | ||
534 | struct fsl_desc_sw *new; | ||
535 | |||
536 | if (!dchan) | ||
537 | return NULL; | ||
538 | |||
539 | chan = to_fsl_chan(dchan); | ||
540 | |||
541 | new = fsl_dma_alloc_descriptor(chan); | ||
542 | if (!new) { | ||
543 | chan_err(chan, "%s\n", msg_ld_oom); | ||
544 | return NULL; | ||
545 | } | ||
546 | |||
547 | new->async_tx.cookie = -EBUSY; | ||
548 | new->async_tx.flags = flags; | ||
549 | |||
550 | /* Insert the link descriptor to the LD ring */ | ||
551 | list_add_tail(&new->node, &new->tx_list); | ||
552 | |||
553 | /* Set End-of-link to the last link descriptor of new list */ | ||
554 | set_ld_eol(chan, new); | ||
555 | |||
556 | return &new->async_tx; | ||
557 | } | ||
558 | |||
559 | static struct dma_async_tx_descriptor * | ||
560 | fsl_dma_prep_memcpy(struct dma_chan *dchan, | 531 | fsl_dma_prep_memcpy(struct dma_chan *dchan, |
561 | dma_addr_t dma_dst, dma_addr_t dma_src, | 532 | dma_addr_t dma_dst, dma_addr_t dma_src, |
562 | size_t len, unsigned long flags) | 533 | size_t len, unsigned long flags) |
@@ -1308,12 +1279,10 @@ static int fsldma_of_probe(struct platform_device *op) | |||
1308 | fdev->irq = irq_of_parse_and_map(op->dev.of_node, 0); | 1279 | fdev->irq = irq_of_parse_and_map(op->dev.of_node, 0); |
1309 | 1280 | ||
1310 | dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask); | 1281 | dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask); |
1311 | dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask); | ||
1312 | dma_cap_set(DMA_SG, fdev->common.cap_mask); | 1282 | dma_cap_set(DMA_SG, fdev->common.cap_mask); |
1313 | dma_cap_set(DMA_SLAVE, fdev->common.cap_mask); | 1283 | dma_cap_set(DMA_SLAVE, fdev->common.cap_mask); |
1314 | fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources; | 1284 | fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources; |
1315 | fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources; | 1285 | fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources; |
1316 | fdev->common.device_prep_dma_interrupt = fsl_dma_prep_interrupt; | ||
1317 | fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy; | 1286 | fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy; |
1318 | fdev->common.device_prep_dma_sg = fsl_dma_prep_sg; | 1287 | fdev->common.device_prep_dma_sg = fsl_dma_prep_sg; |
1319 | fdev->common.device_tx_status = fsl_tx_status; | 1288 | fdev->common.device_tx_status = fsl_tx_status; |