diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-03-18 18:16:19 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-18 18:16:19 +0100 |
| commit | 381a3c4a33bf33943ed3791bd8797d8d8490b4fd (patch) | |
| tree | 122afe0267936a19c23d340b4291b66c6b92cee7 /drivers/dma/dma-jz4740.c | |
| parent | dmaengine: pl330: fix return status on pending transfers (diff) | |
| parent | dmaengine: sun6i: remove device_alloc_chan_resources handler (diff) | |
| download | linux-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.tar.xz linux-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.zip | |
Merge branch 'topic/alloc_removal' into for-linus
Diffstat (limited to 'drivers/dma/dma-jz4740.c')
| -rw-r--r-- | drivers/dma/dma-jz4740.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c index 248a6ee1775b..7497578c9cfc 100644 --- a/drivers/dma/dma-jz4740.c +++ b/drivers/dma/dma-jz4740.c @@ -492,11 +492,6 @@ static enum dma_status jz4740_dma_tx_status(struct dma_chan *c, return status; } -static int jz4740_dma_alloc_chan_resources(struct dma_chan *c) -{ - return 0; -} - static void jz4740_dma_free_chan_resources(struct dma_chan *c) { vchan_free_chan_resources(to_virt_chan(c)); @@ -536,7 +531,6 @@ static int jz4740_dma_probe(struct platform_device *pdev) dma_cap_set(DMA_SLAVE, dd->cap_mask); dma_cap_set(DMA_CYCLIC, dd->cap_mask); - dd->device_alloc_chan_resources = jz4740_dma_alloc_chan_resources; dd->device_free_chan_resources = jz4740_dma_free_chan_resources; dd->device_tx_status = jz4740_dma_tx_status; dd->device_issue_pending = jz4740_dma_issue_pending; |