diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2015-03-18 22:46:19 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-18 22:46:19 +0530 |
| commit | 381a3c4a33bf33943ed3791bd8797d8d8490b4fd (patch) | |
| tree | 122afe0267936a19c23d340b4291b66c6b92cee7 /drivers/dma/k3dma.c | |
| parent | dmaengine: pl330: fix return status on pending transfers (diff) | |
| parent | dmaengine: sun6i: remove device_alloc_chan_resources handler (diff) | |
| download | linux-dev-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.tar.xz linux-dev-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.zip | |
Merge branch 'topic/alloc_removal' into for-linus
Diffstat (limited to 'drivers/dma/k3dma.c')
| -rw-r--r-- | drivers/dma/k3dma.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 3ac9256ce87e..647e362f01fd 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -313,11 +313,6 @@ static void k3_dma_tasklet(unsigned long arg) } } -static int k3_dma_alloc_chan_resources(struct dma_chan *chan) -{ - return 0; -} - static void k3_dma_free_chan_resources(struct dma_chan *chan) { struct k3_dma_chan *c = to_k3_chan(chan); @@ -728,7 +723,6 @@ static int k3_dma_probe(struct platform_device *op) dma_cap_set(DMA_SLAVE, d->slave.cap_mask); dma_cap_set(DMA_MEMCPY, d->slave.cap_mask); d->slave.dev = &op->dev; - d->slave.device_alloc_chan_resources = k3_dma_alloc_chan_resources; d->slave.device_free_chan_resources = k3_dma_free_chan_resources; d->slave.device_tx_status = k3_dma_tx_status; d->slave.device_prep_dma_memcpy = k3_dma_prep_memcpy; |