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/sun6i-dma.c | |
parent | 75967b788c2898601620ce91ed14b4a9a371b6fe (diff) | |
parent | 2fcb9e3c86fc312beb031832fca783498fd4bdb5 (diff) | |
download | op-kernel-dev-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.zip op-kernel-dev-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.tar.gz |
Merge branch 'topic/alloc_removal' into for-linus
Diffstat (limited to 'drivers/dma/sun6i-dma.c')
-rw-r--r-- | drivers/dma/sun6i-dma.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 5358453..11e5365 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -796,11 +796,6 @@ static void sun6i_dma_issue_pending(struct dma_chan *chan) spin_unlock_irqrestore(&vchan->vc.lock, flags); } -static int sun6i_dma_alloc_chan_resources(struct dma_chan *chan) -{ - return 0; -} - static void sun6i_dma_free_chan_resources(struct dma_chan *chan) { struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); @@ -957,7 +952,6 @@ static int sun6i_dma_probe(struct platform_device *pdev) dma_cap_set(DMA_SLAVE, sdc->slave.cap_mask); INIT_LIST_HEAD(&sdc->slave.channels); - sdc->slave.device_alloc_chan_resources = sun6i_dma_alloc_chan_resources; sdc->slave.device_free_chan_resources = sun6i_dma_free_chan_resources; sdc->slave.device_tx_status = sun6i_dma_tx_status; sdc->slave.device_issue_pending = sun6i_dma_issue_pending; |